Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
accounts	Further improve the media attached status query for accounts (#16106)	2021-04-26 18:57:46 +02:00
admin	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
announcements
apps
crypto
emails	Fix e-mail confirmations API not working correctly (#16348)	2021-06-02 21:07:50 +02:00
featured_tags
instances	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
lists
polls
push
statuses
timelines
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
accounts_controller.rb	Add remove from followers api (#16864)	2021-10-18 12:02:35 +02: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	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
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	Change auto-following admin-selected accounts, show in recommendations (#16078)	2021-04-24 17:01:43 +02:00