Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.		2020-11-08 14:20:35 +01:00
..
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
admin	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
announcements	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
apps	…
instances	…
lists	…
polls	…
push	…
statuses	Fix not being able to unbookmark toots when blocked by their author (#14604)	2020-08-19 19:02:06 +02:00
timelines	Fix tests being broken because of different default setting	2019-09-13 20:28:22 +02:00
accounts_controller_spec.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
announcements_controller_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
apps_controller_spec.rb	…
blocks_controller_spec.rb	…
bookmarks_controller_spec.rb	Support min_id-based pagination for bookmarks (#12381)	2019-11-17 17:09:41 +01:00
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	…
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	…
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	Add announcements (#12662)	2020-01-23 22:00:13 +01:00