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
..
0_duplicate_migrations.rb
0_post_deployment_migrations.rb
1_hosts.rb	Fix host check on healthcheck path not being disabled (#16270)	2021-05-17 22:36:08 +02:00
2_whitelist_mode.rb
active_model_serializers.rb
application_controller_renderer.rb
assets.rb
backtrace_silencers.rb
blacklists.rb
cache_buster.rb
chewy.rb	Fix ElasticSearch to Elasticsearch (#17050)	2021-11-26 08:30:02 +01:00
content_security_policy.rb
cookies_serializer.rb
cors.rb
devise.rb	Fix reviving revoked sessions and invalidating login (#16943)	2021-11-06 00:13:58 +01:00
doorkeeper.rb
fast_blank.rb
ffmpeg.rb
filter_parameter_logging.rb
http_client_proxy.rb
httplog.rb
inflections.rb
json_ld.rb
kaminari_config.rb
locale.rb
mail_delivery_job.rb	Fix mailer jobs for deleted notifications erroring out (#16294)	2021-05-24 03:02:46 +02:00
makara.rb
mime_types.rb
oj.rb
omniauth.rb	New env variable: CAS_SECURITY_ASSUME_EMAIL_IS_VERIFIED (#16655)	2021-08-25 18:41:24 +02:00
open_uri_redirection.rb
paperclip.rb
permissions_policy.rb
preload_link_headers.rb
premailer_rails.rb
rack_attack.rb
rack_attack_logging.rb
redis.rb
session_activations.rb
session_store.rb	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
sidekiq.rb	Add a Redis environment variable for sidekiq (#16188)	2021-05-09 10:40:17 +02:00
simple_form.rb
single_user_mode.rb
statsd.rb
stoplight.rb
strong_migrations.rb
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb	Minor memory optimizations (#16507)	2021-10-14 21:04:57 +02:00
vapid.rb
webauthn.rb
wrap_parameters.rb