Claire f1a6f9062e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Upstream moved things around in a place where glitch-soc had support for an extra parameter (`content_type`). Follow upstream but reintroduce `content_type`.		2022-02-10 19:09:27 +01:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-28 08:58:32 +01:00
admin	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
announcements
apps
instances
lists	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
polls	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
push	Add policy param to POST /api/v1/push/subscriptions (#16040)	2021-04-15 05:00:25 +02:00
statuses	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
timelines	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-28 08:58:32 +01:00
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
accounts_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
announcements_controller_spec.rb
apps_controller_spec.rb	Fix app name, website and redirect URIs not having a maximum length (#16042)	2021-04-15 16:28:43 +02:00
blocks_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
bookmarks_controller_spec.rb
conversations_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
custom_emojis_controller_spec.rb
domain_blocks_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
endorsements_controller_spec.rb
favourites_controller_spec.rb
filters_controller_spec.rb
follow_requests_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
instances_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
lists_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
markers_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
media_controller_spec.rb	Add editing for published statuses (#17320)	2022-02-10 00:15:30 +01:00
mutes_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
notifications_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
polls_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
reports_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
statuses_controller_spec.rb	Add editing for published statuses (#17320)	2022-02-10 00:15:30 +01:00
streaming_controller_spec.rb
suggestions_controller_spec.rb