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
..
action_dispatch	replace all instances of "ends_with?" with "end_with?" (#15745)	2021-02-19 09:56:14 +01:00
active_record	Remove dependency on pluck_each gem (#16012)	2021-04-12 03:35:58 +02:00
assets
chewy/strategy
devise
generators
json_ld
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
paperclip	Fix upload of remote media with OpenStack Swift sometimes failing (#16998)	2021-11-16 21:36:28 +01:00
rails
redis
sanitize_ext	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-19 13:57:15 +01:00
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
templates
terrapin	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
webpacker
cli.rb	Fix tootctl self-destruct not sending Delete activities for recently-suspended accounts (#16688)	2021-10-14 19:59:28 +02:00
enumerable.rb
exceptions.rb	Fix media redownload worker retrying on unexpected response codes (#16111)	2021-05-05 23:46:59 +02:00