Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.		2024-01-10 17:51:12 +01:00
..
0_duplicate_migrations.rb	Fix lint issue in glitch-soc-only file	2023-12-20 22:25:23 +01:00
0_post_deployment_migrations.rb	…
1_hosts.rb	Change streaming API host to not be overridden to localhost in development mode (#28557)	2024-01-03 10:23:58 +00:00
2_limited_federation_mode.rb	…
3_omniauth.rb	Fix `Style/SymbolProc` cop (#28386)	2023-12-18 09:32:02 +00:00
active_model_serializers.rb	…
application_controller_renderer.rb	…
backtrace_silencers.rb	…
blacklists.rb	…
cache_buster.rb	…
cache_logging.rb	…
chewy.rb	…
content_security_policy.rb	Reduce CSP configuration changes with upstream (#2536)	2023-12-27 09:54:05 +01:00
cookie_rotator.rb	Change cookie rotator to use SHA1 digest for new cookies (#27392)	2023-12-12 12:01:08 +00:00
cookies_serializer.rb	…
cors.rb	…
devise.rb	…
doorkeeper.rb	…
fast_blank.rb	…
ffmpeg.rb	…
filter_parameter_logging.rb	…
http_client_proxy.rb	…
httplog.rb	…
i18n.rb	…
inflections.rb	Add zeitwerk inflector for cli->CLI (#27635)	2023-11-30 13:55:20 +00:00
json_ld_identity.rb	…
json_ld_security.rb	…
kaminari_config.rb	…
locale.rb	…
mail_delivery_job.rb	…
mime_types.rb	…
new_framework_defaults_7_1.rb	Remove the 7.1 marshalling format "todo" from new_framework_defaults (#28625)	2024-01-08 10:16:33 +00:00
oj.rb	…
open_redirects.rb	Move old framework defaults file to regular config value (#28623)	2024-01-08 10:17:38 +00:00
open_uri_redirection.rb	…
paperclip.rb	…
permissions_policy.rb	…
pghero.rb	…
preload_link_headers.rb	…
premailer_rails.rb	Move lib/mastodon/premailer_webpack_strategy to lib/ (#27636)	2023-11-29 10:08:55 +00:00
rack_attack.rb	…
rack_attack_logging.rb	…
redis.rb	…
session_activations.rb	…
session_store.rb	…
sidekiq.rb	…
simple_form.rb	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream	2023-12-21 19:24:10 +01:00
single_user_mode.rb	…
statsd.rb	…
stoplight.rb	…
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
trusted_proxies.rb	Assign a proc to `Rack::Request.ip_filter` instead of patching method (#28380)	2023-12-15 14:33:56 +00:00
twitter_regex.rb	…
vapid.rb	…
webauthn.rb	…
wrap_parameters.rb	…