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

Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

2023-08-02 19:32:48 +02:00

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

Allow setting a custom HTTP method in CacheBuster (#26528)

2023-08-18 08:18:40 +02:00

cache_logging.rb

…

chewy.rb

Fix empty ENV variables not using default nil value (#27400)

2023-10-13 19:00:53 +02:00

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

Run bin/rails app:update with Rails 7.1 (#27522)

2023-10-25 13:56:09 +00:00

devise.rb

Silence deprecation warning about secrets/credentials with Devise patch (#27578)

2023-10-31 11:10:15 +00:00

doorkeeper.rb

Fix Lint/UnusedBlockArgument cop (#27777)

2023-11-09 09:43:26 +00:00

fast_blank.rb

…

ffmpeg.rb

…

filter_parameter_logging.rb

Run bin/rails app:update with Rails 7.1 (#27522)

2023-10-25 13:56:09 +00:00

http_client_proxy.rb

…

httplog.rb

…

i18n.rb

Move i18n locale configuration to separate initializer (#27571)

2023-11-07 15:22:14 +00:00

inflections.rb

Add zeitwerk inflector for cli->CLI (#27635)

2023-11-30 13:55:20 +00:00

json_ld_identity.rb

Move json_ld context loaders to config/initializers (#27590)

2023-10-31 15:21:23 +00:00

json_ld_security.rb

Move json_ld context loaders to config/initializers (#27590)

2023-10-31 15:21:23 +00:00

kaminari_config.rb

…

locale.rb

…

mail_delivery_job.rb

…

mime_types.rb

Fix invalid Content-Type header for WebP images (#26773)

2023-09-04 09:46:33 +02:00

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

Fix Lint/UnusedBlockArgument cop (#27777)

2023-11-09 09:43:26 +00:00

permissions_policy.rb

Run bin/rails app:update with Rails 7.1 (#27522)

2023-10-25 13:56:09 +00:00

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_logging.rb

…

rack_attack.rb

Autofix Rubocop cops for config/ (#24145)

2023-10-03 15:24:12 +02:00

redis.rb

…

session_activations.rb

…

session_store.rb

Fix rubocop Layout/ArgumentAlignment cop (#26060)

2023-09-28 15:48:47 +02:00

sidekiq.rb

Disable sidekiq unique jobs in test env (#27737)

2023-11-09 16:19:04 +00:00

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

Re-add StatsD support through the nsa gem (#26310)

2023-08-03 20:28:14 +02:00

stoplight.rb

…

strong_migrations.rb

Capture minimum postgres version 12 (#27528)

2023-10-26 20:35:15 +00:00

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

Update rubocop rules for linelength (#26190)

2023-07-28 23:11:45 +02:00

vapid.rb

…

webauthn.rb

…

wrap_parameters.rb

…