Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream ... - `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.		2021-05-07 18:21:59 +02: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	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
blacklists.rb
cache_buster.rb
chewy.rb
content_security_policy.rb
cookies_serializer.rb
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	Fix cookies not having a SameSite attribute (#15098)	2020-11-06 11:57:14 +01:00
doorkeeper.rb
fast_blank.rb
ffmpeg.rb
filter_parameter_logging.rb	Added optional two-factor authentication	2017-01-27 20:35:16 +01:00
http_client_proxy.rb
httplog.rb
inflections.rb
json_ld.rb
kaminari_config.rb
locale.rb
makara.rb
mime_types.rb
oj.rb
omniauth.rb	Support clock drift in Omniauth SAML provider (#15511)	2021-01-08 07:07:08 +01:00
open_uri_redirection.rb
paperclip.rb
permissions_policy.rb
preload_link_headers.rb
premailer_rails.rb
rack_attack.rb
rack_attack_logging.rb
redis.rb
session_activations.rb
session_store.rb
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
statsd.rb	Remove unused StatsD code and expose StatsD as a global variable (#11232)	2019-07-02 11:34:39 +02:00
stoplight.rb
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	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
webauthn.rb
wrap_parameters.rb