Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.		2021-11-26 22:53:55 +01:00
..
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	…
action_logs_controller.rb	…
announcements_controller.rb	…
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	…
dashboard_controller.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
domain_allows_controller.rb	…
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
follow_recommendations_controller.rb	…
instances_controller.rb	…
invites_controller.rb	…
ip_blocks_controller.rb	…
pending_accounts_controller.rb	…
relationships_controller.rb	…
relays_controller.rb	…
report_notes_controller.rb	…
reported_statuses_controller.rb	…
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	…
rules_controller.rb	…
settings_controller.rb	…
sign_in_token_authentications_controller.rb	…
site_uploads_controller.rb	…
statuses_controller.rb	Fix admin statuses order(#16937) (#16969)	2021-11-26 22:12:27 +01:00
subscriptions_controller.rb	…
tags_controller.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
two_factor_authentications_controller.rb	…
warning_presets_controller.rb	…