FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views
History
Eugen Rochko bf3cb42da7 Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) 
Cherry-picked d2528b26b6

Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream changed stuff, we had extra attributes.
  Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
  Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
  so updated that file by keeping our extra attributes, and took upstream's
  version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
  Took upstream's version.
 		2022-10-09 19:51:39 +02:00
..
about Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) 2022-10-09 19:51:39 +02:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
admin Revert "Change "Allow trends without prior review" setting to include statuses (#17977)" 2022-10-02 18:46:28 +02:00
admin_mailer Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
application Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) 2022-10-09 19:51:39 +02:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
authorize_interactions Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
custom_css Fix badge color not affected (#18826) 2022-07-19 01:06:11 +02:00
directories Merge branch 'main' into glitch-soc/merge-upstream 2022-03-28 16:22:28 +02:00
disputes/strikes Fix ambiguous wording on appeal actions (#18328) 2022-05-06 21:41:34 +02:00
errors
…
filters Fix error when accessing /filters/:id/statuses on glitch-soc (#1837) 2022-08-31 11:55:27 +02:00
follower_accounts Add `/api/v1/accounts/familiar_followers` to REST API (#17700) 2022-03-07 09:36:47 +01:00
following_accounts Add `/api/v1/accounts/familiar_followers` to REST API (#17700) 2022-03-07 09:36:47 +01:00
home [Glitch] Allow non-logged users to access /web 2022-10-09 18:23:15 +02:00
invites
…
kaminari
…
layouts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
media Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
notification_mailer Remove digest e-mails (#17985) 2022-08-25 23:38:22 +02:00
oauth Change visual separation of applications in authorized apps list (#17686) 2022-03-02 20:28:25 +01:00
privacy Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) 2022-10-09 19:51:39 +02:00
public_timelines Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
relationships Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
remote_follow
…
remote_interaction
…
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
shared Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) 2022-10-09 19:51:39 +02:00
shares Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
statuses_cleanup Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
user_mailer Change path of privacy policy page (#19249) 2022-09-29 06:22:12 +02:00
well_known/host_meta Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00