Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
  Not really a conflict, upstream change (removing the spam checker) too close
  to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
  Same.
- `app/services/remove_status_service.rb`:
  Same.
- `app/views/admin/settings/edit.html.haml`:
  Same.
- `config/settings.yml`:
  Same.
- `config/environments/production.rb`:
  Not a real conflict, upstream added a default HTTP header, but we have
  extra headers in glitch-soc.
  Added the header.

2021-04-20 12:17:14 +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

Add post-deployment migration system (#8182)

2018-08-13 18:17:20 +02:00

1_hosts.rb

Set Content-Security-Policy rules through RoR's config (#8957)

2018-10-11 20:35:46 +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

Fix ActivityPub context not being dynamically computed (#11746)

2019-09-03 22:52:32 +02:00

application_controller_renderer.rb

Update Mastodon to Rails 6.1 (#15910)

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

assets.rb

HTML e-mails for UserMailer (#6256)

2018-01-16 03:29:11 +01:00

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 unnecessary queries when batch-removing statuses, 100x faster (#15387)

2020-12-22 17:13:55 +01:00

content_security_policy.rb

Merge branch 'main' into glitch-soc/merge-upstream

2021-04-20 12:17:14 +02:00

cookies_serializer.rb

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

cors.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-15 10:45:53 +01:00

delivery_job.rb

Skip mailer job retries when a record no longer exists (#9590)

2018-12-21 06:16:17 +01:00

devise.rb

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

2021-02-11 23:47:05 +01: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

add ffmpeg initializer (#8855)

2018-10-09 03:02:52 +02:00

filter_parameter_logging.rb

Added optional two-factor authentication

2017-01-27 20:35:16 +01:00

http_client_proxy.rb

Refactor monkey-patching of Goldfinger (#12561)

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

httplog.rb

Version bumps for ruby and misc gems (#1159)

2017-04-10 22:47:41 +02:00

inflections.rb

Prepare Mastodon for zeitwerk autoloader (#15917)

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

json_ld.rb

Fix preloaded JSON-LD context for identity not being used (#12138)

2019-10-10 06:48:53 +02:00

kaminari_config.rb

Add ability to filter audit log in admin UI (#13381)

2020-04-03 13:06:34 +02:00

locale.rb

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

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

makara.rb

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

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

mime_types.rb

Set correct content-type for ActivityPub JSON (#4592)

2017-08-14 04:16:43 +02:00

oj.rb

Remove rabl dependency (#5894)

2017-12-06 15:04:49 +09:00

omniauth.rb

Support clock drift in Omniauth SAML provider (#15511)

2021-01-08 07:07:08 +01:00

open_uri_redirection.rb

Optimize some regex matching (#15528)

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

paperclip.rb

Fix autoloading deprecation warnings from Rails 6 (#16010)

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

permissions_policy.rb

Update Mastodon to Rails 6.1 (#15910)

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

preload_link_headers.rb

Update Mastodon to Rails 6.1 (#15910)

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

premailer_rails.rb

HTML e-mails for UserMailer (#6256)

2018-01-16 03:29:11 +01:00

rack_attack_logging.rb

Change rate limits for various paths (#14253)

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

rack_attack.rb

Add POST /api/v1/emails/confirmations to REST API (#15816)

2021-03-01 18:39:47 +01:00

redis.rb

Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)

2020-07-01 19:05:21 +02:00

session_activations.rb

Revocable sessions (#3616)

2017-06-23 18:50:53 +02:00

session_store.rb

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

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

sidekiq.rb

Prepare Mastodon for Rails 6 (#15911)

2021-03-17 10:09:55 +01:00

simple_form.rb

Fixed code quality issues (#15541)

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

single_user_mode.rb

Add single user mode

2016-12-06 17:19:26 +01:00

statsd.rb

Remove unused StatsD code and expose StatsD as a global variable (#11232)

2019-07-02 11:34:39 +02:00

stoplight.rb

Fix stoplight logging to stderr separate from Rails logger (#10624)

2019-04-23 04:39:48 +02:00

strong_migrations.rb

Fix migration failure due to StrongMigrations on production env (#5283)

2017-10-09 10:05:35 +02:00

suppress_csrf_warnings.rb

Fix autoloading deprecation warnings from Rails 6 (#16010)

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

trusted_proxies.rb

Fix error

2017-01-22 23:07:31 +01:00

twitter_regex.rb

Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382)

2021-03-02 12:02:56 +01:00

vapid.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

webauthn.rb

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

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

wrap_parameters.rb

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00