Claire 33d30632fb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly.		2021-01-11 11:55:42 +01:00
..
accounts	…
admin	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
announcements	…
apps	…
instances	…
lists	…
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	…
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	…
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	…
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	…
streaming_controller_spec.rb	…
suggestions_controller_spec.rb	…
trends_controller_spec.rb	…