Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.		2022-01-23 18:24:01 +01:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
admin	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
announcements	…
apps	…
crypto	…
emails	…
featured_tags	…
instances	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
lists	…
polls	…
push	…
statuses	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00
timelines	…
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
accounts_controller.rb	Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)	2022-01-23 15:52:58 +01:00
announcements_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	…
custom_emojis_controller.rb	…
directories_controller.rb	…
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
instances_controller.rb	…
lists_controller.rb	…
markers_controller.rb	…
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	…
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	…
statuses_controller.rb	…
streaming_controller.rb	…
suggestions_controller.rb	…