mastodon/config/initializers
Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
2023-03-15 09:16:10 +01: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
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 Fix sidekiq jobs not triggering Elasticsearch index updates (#24046) 2023-03-12 23:47:55 +01:00
content_security_policy.rb Add form-action CSP directive (#20781) 2022-11-17 10:55:03 +01: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 Add user content translations with configurable backends (#19218) 2022-09-23 23:00:12 +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 Added support for specifying S3 storage classes in environment (#22480) 2023-03-03 20:53:37 +01: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 Change rate limits to 1,500/5m per user, 300/5m per app (#23347) 2023-02-02 00:07:49 +01:00
rack_attack_logging.rb
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 Add “Glitch-only” label to glitch-specific settings 2022-11-12 11:30:35 +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
wrap_parameters.rb