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

Fix ActiveRecord monkey-patching migration hack

2021-03-24 10:55:02 +01:00

0_post_deployment_migrations.rb

…

1_hosts.rb

Fix host check on healthcheck path not being disabled (#16270)

2021-05-17 22:36:08 +02:00

2_whitelist_mode.rb

Remove the terms blacklist and whitelist from UX (#14149)

2020-06-27 20:20:11 +02:00

active_model_serializers.rb

…

application_controller_renderer.rb

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01:00

assets.rb

…

backtrace_silencers.rb

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01:00

blacklists.rb

Remove the terms blacklist and whitelist from UX (#14149)

2020-06-27 20:20:11 +02:00

cache_buster.rb

Add cache buster feature for media files (#15155)

2020-11-19 17:38:06 +01:00

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

Fix app name, website and redirect URIs not having a maximum length (#16042)

2021-04-15 16:28:43 +02:00

fast_blank.rb

Fixed code quality issues (#15541)

2021-01-31 21:26:09 +01:00

ffmpeg.rb

…

filter_parameter_logging.rb

…

http_client_proxy.rb

Refactor monkey-patching of Goldfinger (#12561)

2020-05-10 11:41:43 +02:00

httplog.rb

…

inflections.rb

Prepare Mastodon for zeitwerk autoloader (#15917)

2021-03-19 02:42:43 +01:00

json_ld.rb

…

kaminari_config.rb

…

locale.rb

Move glitch-specific ruby-side locales to their own files

2020-05-30 12:54:17 +02:00

mail_delivery_job.rb

Fix mailer jobs for deleted notifications erroring out (#16294)

2021-05-24 03:02:46 +02:00

makara.rb

Drop dependency on secure_headers, fix response headers (#15712)

2021-02-11 23:47:05 +01:00

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

Optimize some regex matching (#15528)

2021-01-22 10:09:08 +01:00

paperclip.rb

fix: s3_force_single_request not parsed (#17922)

2022-04-01 23:56:23 +02:00

permissions_policy.rb

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01:00

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

Change rate limits for various paths (#14253)

2020-07-07 15:26:39 +02:00

rack_attack.rb

Bump rack-attack from 6.5.0 to 6.6.0 (#17405)

2022-03-12 09:23:53 +01:00

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

Fixed code quality issues (#15541)

2021-01-31 21:26:09 +01:00

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

Fix autoloading deprecation warnings from Rails 6 (#16010)

2021-04-09 02:31:20 +02:00

trusted_proxies.rb

…

twitter_regex.rb

Refactor formatter (#17828)

2022-03-26 02:53:34 +01:00

vapid.rb

…

webauthn.rb

Add WebAuthn as an alternative 2FA method (#14466)

2020-08-24 16:46:27 +02:00

wrap_parameters.rb

…