diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-30 12:10:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-30 12:10:05 +0300 |
| commit | a16109b67fdee47ff1ccf4c0c831a0b47a17ab34 (patch) | |
| tree | 9199632ee66c3076dfeea279e42e91b2827b5ece /config | |
| parent | 52c7972910b960f37ae9792cb4d17876244d4bcf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/session_store.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 530d7342d57..204d4d88f0a 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -27,5 +27,5 @@ Gitlab::Application.config.session_store( secure: Gitlab.config.gitlab.https, httponly: true, 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 || '/' ) |