diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-09 18:13:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-09 18:13:13 +0000 |
| commit | efcaec8a140e2b93d1f43d5afd7a5c35cdd4dad7 (patch) | |
| tree | f10a4a70e5c9213c4cdc7a55788e69f8850d899b /config/initializers_before_autoloader | |
| parent | e6a54b33a9712d7f1a995df47f678fbb78bcd6b7 (diff) | |
| download | gitlab-ce-efcaec8a140e2b93d1f43d5afd7a5c35cdd4dad7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers_before_autoloader')
| -rw-r--r-- | config/initializers_before_autoloader/000_override_framework_defaults.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/initializers_before_autoloader/000_override_framework_defaults.rb b/config/initializers_before_autoloader/000_override_framework_defaults.rb index 3f8faa78d41..4f0f569c36e 100644 --- a/config/initializers_before_autoloader/000_override_framework_defaults.rb +++ b/config/initializers_before_autoloader/000_override_framework_defaults.rb @@ -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 |