Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		2022-05-01 16:52:27 +02: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
chewy.rb	Fix ElasticSearch to Elasticsearch (#17050)	2021-11-26 08:30:02 +01:00
content_security_policy.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-15 20:45:27 +01:00
cookies_serializer.rb
cors.rb
devise.rb	Fix cookies secure flag being set when served over Tor (#17992)	2022-04-08 12:47:18 +02: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
makara.rb
mime_types.rb
oj.rb
omniauth.rb	Allow login through OpenID Connect (#16221)	2022-03-09 12:07:35 +01:00
open_uri_redirection.rb
paperclip.rb	fix: s3_force_single_request not parsed (#17922)	2022-04-01 23:56:23 +02:00
permissions_policy.rb
pghero.rb	Fix PgHero suggesting migrations (#17807)	2022-03-15 20:27:49 +01:00
preload_link_headers.rb	Fix various typos (#17621)	2022-02-22 20:14:17 +01:00
premailer_rails.rb
rack_attack.rb	Bump rack-attack from 6.5.0 to 6.6.0 (#17405)	2022-03-12 09:23:53 +01:00
rack_attack_logging.rb
session_activations.rb
session_store.rb	Fix cookies secure flag being set when served over Tor (#17992)	2022-04-08 12:47:18 +02:00
sidekiq.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
simple_form.rb
single_user_mode.rb
statsd.rb
stoplight.rb	Fix opening and closing Redis connections instead of using a pool (#18171)	2022-04-29 22:43:07 +02:00
strong_migrations.rb
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
vapid.rb
webauthn.rb
wrap_parameters.rb