Claire e855df149b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.		2021-10-25 20:28:51 +02:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +01:00
admin	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
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	Fix not being able to unfavorite toots one has lost access to (#15192)	2020-11-21 06:18:09 +01:00
timelines
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	Change ResolveAccountService's handling of skip_webfinger (#15750)	2021-02-24 06:32:13 +01:00
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	Remove glitch-soc specific and obsolete /api/v1/mutes/details	2020-10-21 21:28:47 +02:00
notifications_controller_spec.rb	Change ResolveAccountService's handling of skip_webfinger (#15750)	2021-02-24 06:32:13 +01:00
polls_controller_spec.rb
reports_controller_spec.rb
statuses_controller_spec.rb	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
streaming_controller_spec.rb
suggestions_controller_spec.rb
trends_controller_spec.rb