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
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
..
chewy
…
controllers Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) 2022-10-09 19:51:39 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
javascript Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) 2022-10-09 19:51:39 +02:00
lib [Glitch] Allow non-logged users to access /web 2022-10-09 18:23:15 +02:00
mailers Remove digest e-mails (#17985) 2022-08-25 23:38:22 +02:00
models Revert "Change "Allow trends without prior review" setting to include statuses (#17977)" 2022-10-02 18:46:28 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
presenters Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) 2022-10-09 19:51:39 +02:00
serializers Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) 2022-10-09 19:51:39 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
views Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294) 2022-10-09 19:51:39 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00