Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
0_post_deployment_migrations.rb
1_hosts.rb
2_whitelist_mode.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +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
assets.rb
backtrace_silencers.rb
blacklists.rb
chewy.rb
content_security_policy.rb	Fix connect-src policy for Tesseract	2019-08-19 22:02:35 +02:00
cookies_serializer.rb
cors.rb
delivery_job.rb
devise.rb	Fix authentication before 2FA challenge (#11943)	2019-09-24 04:35:36 +02:00
doorkeeper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
fast_blank.rb
ffmpeg.rb
filter_parameter_logging.rb
health_check.rb	Hide error message on /heath (#11947)	2019-09-24 20:28:25 +02:00
http_client_proxy.rb
httplog.rb
inflections.rb	Add a nodeinfo endpoint (#12002)	2019-09-29 21:31:51 +02:00
json_ld.rb
kaminari_config.rb
locale.rb
mime_types.rb
oj.rb
omniauth.rb
open_uri_redirection.rb
pagination.rb
paperclip.rb	Cast multipart threshold to integer (#11944)	2019-09-24 17:32:12 +02:00
premailer_rails.rb
rack_attack.rb	Change rate limit for media proxy (#11814)	2019-09-13 16:02:52 +02:00
rack_attack_logging.rb
redis.rb
session_activations.rb
session_store.rb
sidekiq.rb
simple_form.rb	Change preferences page into appearance, notifications, and other (#10977)	2019-06-07 03:39:24 +02: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
trusted_proxies.rb
twitter_regex.rb
vapid.rb
wrap_parameters.rb