This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/config/initializers
Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.
2020-11-20 13:27:48 +01:00
..
0_duplicate_migrations.rb
0_post_deployment_migrations.rb
1_hosts.rb
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
assets.rb
backtrace_silencers.rb
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
content_security_policy.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-07-07 15:58:45 +02:00
cookies_serializer.rb
cors.rb
delivery_job.rb
devise.rb Fix cookies not having a SameSite attribute (#15098) 2020-11-06 11:57:14 +01:00
doorkeeper.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
fast_blank.rb
ffmpeg.rb
filter_parameter_logging.rb
health_check.rb
http_client_proxy.rb
httplog.rb
inflections.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02: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
makara.rb Fix cookies not having a SameSite attribute (#15098) 2020-11-06 11:57:14 +01:00
mime_types.rb
oj.rb
omniauth.rb
open_uri_redirection.rb
pagination.rb
paperclip.rb Add cache buster feature for media files (#15155) 2020-11-19 17:38:06 +01:00
premailer_rails.rb
rack_attack.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
rack_attack_logging.rb Change rate limits for various paths (#14253) 2020-07-07 15:26:39 +02: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
session_store.rb Fix cookies not having a SameSite attribute (#15098) 2020-11-06 11:57:14 +01:00
sidekiq.rb
simple_form.rb
single_user_mode.rb
statsd.rb
stoplight.rb
strong_migrations.rb
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb Add support for Gemini urls (#15013) 2020-10-19 17:02:13 +02:00
vapid.rb
webauthn.rb Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
wrap_parameters.rb