treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec
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
..
controllers [Glitch] Allow non-logged users to access /web 2022-10-09 18:23:15 +02:00
fabricators Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +02:00
features Add submit button to the top of preferences pages (#13068) 2020-03-08 16:04:03 +01:00
fixtures Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
helpers Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +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 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +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
requests Further preparation for Rails 6 (#15916) 2021-03-19 02:45:34 +01:00
routing Move create/destroy actions for api/v1/statuses to namespace (#3678) 2017-06-10 09:39:26 +02:00
serializers/activitypub
…
services Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
support Spelling (#17705) 2022-03-06 22:51:40 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +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 Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +02:00
rails_helper.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
spec_helper.rb Improve tests involving push_bulk (#17508) 2022-02-10 19:42:45 +01:00