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
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
fabricators	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
features
fixtures	Fix some link previews being incorrectly generated from other prior links (#16885)	2021-10-21 20:39:35 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
mailers	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
models	Revert "Fix trends admin page crashing"	2021-11-26 01:15:29 +01:00
policies
presenters	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	2021-07-13 15:46:20 +02:00
requests
routing
serializers/activitypub
services	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
support
validators
views	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-13 15:50:24 +02:00
workers	Fix AccountNote not having a maximum length (#16942)	2021-11-06 00:12:25 +01:00
rails_helper.rb
spec_helper.rb