Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.		2023-02-03 19:23:27 +01:00
..
0_duplicate_migrations.rb
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
content_security_policy.rb	Add form-action CSP directive (#20781)	2022-11-17 10:55:03 +01: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	Add user content translations with configurable backends (#19218)	2022-09-23 23:00:12 +02:00
json_ld.rb
kaminari_config.rb
locale.rb	Actually fix config/locales-glitch not overriding translation strings (#1872)	2022-10-19 22:08:10 +02:00
mail_delivery_job.rb
makara.rb
mime_types.rb
oj.rb
omniauth.rb
open_uri_redirection.rb
paperclip.rb	Add Cache-Control header to openstack-stored files (#20610)	2022-11-14 05:26:49 +01:00
permissions_policy.rb
pghero.rb
preload_link_headers.rb
premailer_rails.rb
rack_attack.rb	Change rate limits to 1,500/5m per user, 300/5m per app (#23347)	2023-02-02 00:07:49 +01:00
rack_attack_logging.rb
session_activations.rb
session_store.rb
sidekiq.rb	Fix vacuum scheduler missing lock, locks never expiring (#19458)	2022-10-26 12:10:48 +02:00
simple_form.rb	Add “Glitch-only” label to glitch-specific settings	2022-11-12 11:30:35 +01:00
single_user_mode.rb
statsd.rb
stoplight.rb
strong_migrations.rb
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb
vapid.rb
webauthn.rb
wrap_parameters.rb