Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream ...

Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.

2023-07-12 15:27:32 +02:00

..

0_duplicate_migrations.rb

Fix most rubocop issues (#2165)

2023-04-09 11:25:30 +02:00

0_post_deployment_migrations.rb

Add post-deployment migration system (#8182)

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

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

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

Revert "Rails 7 update" (#25667)

2023-07-02 11:14:22 +02: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

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 CSP headers when S3_ALIAS_HOST includes a path component (#25273)

2023-06-05 17:35:05 +02:00

cookies_serializer.rb

…

cors.rb

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

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

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

Fixed code quality issues (#15541)

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

ffmpeg.rb

Autofix Rubocop spacing in config (#25022)

2023-05-22 13:17:56 +02:00

filter_parameter_logging.rb

Revert "Rails 7 update" (#25667)

2023-07-02 11:14:22 +02:00

http_client_proxy.rb

Support "http_hidden_proxy" ENV var for hidden service only proxy (#18427)

2022-08-25 04:41:14 +02:00

httplog.rb

Version bumps for ruby and misc gems (#1159)

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

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

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

Actually fix config/locales-glitch not overriding translation strings (#1872)

2022-10-19 22:08:10 +02:00

mail_delivery_job.rb

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

2021-05-24 03:02:46 +02: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

Autofix Rubocop spacing in config (#25022)

2023-05-22 13:17:56 +02:00

open_uri_redirection.rb

Optimize some regex matching (#15528)

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

paperclip.rb

Merge pull request from GHSA-9928-3cp5-93fm

2023-07-06 15:05:05 +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

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

Autofix Rubocop Regex Style rules (#23690)

2023-06-06 14:50:51 +02:00

redis.rb

Upgrade to latest redis-rb 4.x and fix deprecations (#23616)

2023-03-04 16:38:28 +01:00

session_activations.rb

Revocable sessions (#3616)

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

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 vacuum scheduler missing lock, locks never expiring (#19458)

2022-10-26 12:10:48 +02:00

simple_form.rb

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

2023-06-10 16:22:14 +02:00

single_user_mode.rb

Add single user mode

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

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

Fix compatibility of recent migration with PostgreSQL 10 (#25324)

2023-06-07 01:53:50 +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

Autofix Rubocop Regex Style rules (#23690)

2023-06-06 14:50:51 +02:00

vapid.rb

Lint pass (#8876)

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

webauthn.rb

Autofix Rubocop spacing in config (#25022)

2023-05-22 13:17:56 +02:00

wrap_parameters.rb

…