mastodon-glitch/config/initializers
Claire d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02:00
..
0_duplicate_migrations.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02: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
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
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 Rails/Present cop (#24688) 2023-04-30 06:47:50 +02: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 Fixed code quality issues (#15541) 2021-01-31 21:26:09 +01:00
ffmpeg.rb
filter_parameter_logging.rb
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
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
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 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 Fix CAS_DISPLAY_NAME, SAML_DISPLAY_NAME and OIDC_DISPLAY_NAME being ignored (#18568) 2022-06-01 19:22:55 +02:00
open_uri_redirection.rb Optimize some regex matching (#15528) 2021-01-22 10:09:08 +01:00
paperclip.rb Fix Performance/RedundantMerge cop (#24817) 2023-05-04 05:25:43 +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.rb Drop EOL Ruby 2.7 (#24237) 2023-04-27 01:46:18 +02:00
rack_attack_logging.rb Change rate limits for various paths (#14253) 2020-07-07 15:26:39 +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
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 Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02: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 Autofix Rubocop Style/NumericLiterals (#24468) 2023-04-23 22:30:07 +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
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