Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		2021-03-02 12:06:58 +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	Add specs for Api::V1::Instances::PeersController (#9546)	2018-12-17 11:35:55 +01:00
lists	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
polls	…
push	…
statuses	Fix not being able to unfavorite toots one has lost access to (#15192)	2020-11-21 06:18:09 +01:00
timelines	Fix tests being broken because of different default setting	2019-09-13 20:28:22 +02:00
accounts_controller_spec.rb	Fix muting users with duration via the REST api (#15516)	2021-01-10 12:47:21 +01: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	…
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	…
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	Support min_id-based pagination in REST API (#8736)	2018-09-28 02:23:45 +02:00
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	Re-add follow recommendations API (#7918)	2018-07-03 01:47:56 +02:00
trends_controller_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00