Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.		2023-05-08 15:28:36 +02:00
..
0_duplicate_migrations.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
0_post_deployment_migrations.rb
1_hosts.rb
2_whitelist_mode.rb
active_model_serializers.rb
application_controller_renderer.rb
assets.rb
backtrace_silencers.rb
blacklists.rb
cache_buster.rb
cache_logging.rb	Add logging for Rails cache timeouts (#21667)	2022-11-27 20:37:37 +01:00
chewy.rb	Change root Chewy strategy to emit a warning instead of erroring out in production mode (#24327)	2023-04-03 15:05:39 +02:00
content_security_policy.rb	Fix Rails/Present cop (#24688)	2023-04-30 06:47:50 +02:00
cookies_serializer.rb
cors.rb
devise.rb	Fix typos in source documentation (#21046)	2022-12-15 15:57:26 +01:00
doorkeeper.rb	Add missing admin scopes (fix #20892) (#20918)	2022-11-17 10:50:21 +01:00
fast_blank.rb
ffmpeg.rb
filter_parameter_logging.rb
http_client_proxy.rb
httplog.rb
inflections.rb	Change user settings to be stored in a more optimal way (#23630)	2023-03-30 14:44:00 +02:00
json_ld.rb
kaminari_config.rb
locale.rb
mail_delivery_job.rb
makara.rb
mime_types.rb
oj.rb
omniauth.rb
open_uri_redirection.rb
paperclip.rb	Fix Rails/CompactBlank cop (#24690)	2023-04-30 14:07:21 +02:00
permissions_policy.rb
pghero.rb
preload_link_headers.rb
premailer_rails.rb
rack_attack.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00
rack_attack_logging.rb
redis.rb	Upgrade to latest redis-rb 4.x and fix deprecations (#23616)	2023-03-04 16:38:28 +01:00
session_activations.rb
session_store.rb
sidekiq.rb
simple_form.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
single_user_mode.rb
statsd.rb
stoplight.rb
strong_migrations.rb	Autofix Rubocop Style/NumericLiterals (#24468)	2023-04-23 22:30:07 +02:00
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb
vapid.rb
webauthn.rb
wrap_parameters.rb