Commit 030b663a authored by James Lopez's avatar James Lopez

Merge branch 'fix-redirect-loop-blank-relative-url-root' into 'master'

Fix redirect loop when relative url root is blank

See merge request gitlab-org/gitlab!67094
parents f0fdb173 d586b5b7
...@@ -27,5 +27,5 @@ Gitlab::Application.config.session_store( ...@@ -27,5 +27,5 @@ Gitlab::Application.config.session_store(
secure: Gitlab.config.gitlab.https, secure: Gitlab.config.gitlab.https,
httponly: true, httponly: true,
expires_in: Settings.gitlab['session_expire_delay'] * 60, expires_in: Settings.gitlab['session_expire_delay'] * 60,
path: Rails.application.config.relative_url_root.nil? ? '/' : Gitlab::Application.config.relative_url_root path: Rails.application.config.relative_url_root.presence || '/'
) )
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