Commit 819076ef authored by Robert Speicher's avatar Robert Speicher

Merge branch 'improve-session-expiry' into 'master'

Fix "remember me" sign in option

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4006

Prior to this change, 'remember me' was effectively always on because
the `_gitlab_session` cookie was always made persistent. With this
change it becomes possible again to have `_gitlab_session`be a session
cookie when 'remember me' is unchecked.

See merge request !4004
parents f47e1e88 dc0ff9a1
...@@ -22,7 +22,7 @@ else ...@@ -22,7 +22,7 @@ else
key: '_gitlab_session', key: '_gitlab_session',
secure: Gitlab.config.gitlab.https, secure: Gitlab.config.gitlab.https,
httponly: true, httponly: true,
expire_after: 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.nil?) ? '/' : Gitlab::Application.config.relative_url_root
) )
end 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