Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-06 00:15:38 +01:00
admin	…
announcements	…
apps	…
instances	…
lists	…
polls	…
push	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040)	2021-04-15 05:00:25 +02:00
statuses	…
timelines	…
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
accounts_controller_spec.rb	Add remove from followers api (#16864)	2021-10-18 12:02:35 +02: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	…
bookmarks_controller_spec.rb	…
conversations_controller_spec.rb	…
custom_emojis_controller_spec.rb	…
domain_blocks_controller_spec.rb	…
endorsements_controller_spec.rb	…
favourites_controller_spec.rb	…
filters_controller_spec.rb	…
follow_requests_controller_spec.rb	…
instances_controller_spec.rb	…
lists_controller_spec.rb	…
markers_controller_spec.rb	…
media_controller_spec.rb	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
mutes_controller_spec.rb	…
notifications_controller_spec.rb	…
polls_controller_spec.rb	…
reports_controller_spec.rb	…
statuses_controller_spec.rb	…
streaming_controller_spec.rb	…
suggestions_controller_spec.rb	…