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
..
credentials_controller.rb
featured_tags_controller.rb	Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415)	2020-12-23 16:43:38 +01:00
follower_accounts_controller.rb
following_accounts_controller.rb
identity_proofs_controller.rb	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
lists_controller.rb
lookup_controller.rb	Add GET /api/v1/accounts/lookup REST API (#15740)	2021-02-16 15:28:32 +01:00
notes_controller.rb
pins_controller.rb
relationships_controller.rb
search_controller.rb
statuses_controller.rb	Further improve the media attached status query for accounts (#16106)	2021-04-26 18:57:46 +02:00