Commit e00a6996 authored by Markus Koller's avatar Markus Koller

Merge branch '332288-use-defaults-for-ssl-config' into 'master'

Use default Rails SSL configuration values

See merge request gitlab-org/gitlab!74040
parents 8f419ff7 10c984ba
......@@ -12,7 +12,6 @@
Rails.application.configure do
# Rails 6.1
config.action_dispatch.cookies_same_site_protection = nil # New default is :lax
config.action_dispatch.ssl_default_redirect_status = nil # New default is 308
ActiveSupport.utc_to_local_returns_utc_offset_times = false
config.action_controller.urlsafe_csrf_tokens = false
config.action_view.preload_links_header = false
......@@ -31,5 +30,4 @@ Rails.application.configure do
config.action_controller.per_form_csrf_tokens = false
config.action_controller.forgery_protection_origin_check = false
ActiveSupport.to_time_preserves_timezone = false
config.ssl_options = {} # New default is { hsts: { subdomains: true } }
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment