diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-02 16:52:22 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-02 16:52:22 +0000 |
| commit | 819076efe136e86dddba4801a85bc750dc521a69 (patch) | |
| tree | 9127216714aa61dd469b6213c0048d224c16e02c | |
| parent | f47e1e8892e41cc4a8aa5d29ce9675cf42acf7b4 (diff) | |
| parent | dc0ff9a17472c71d2e2f5510797976f9ce7cea23 (diff) | |
| download | gitlab-ce-819076efe136e86dddba4801a85bc750dc521a69.tar.gz | |
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
| -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 88cb859871c..599dabb9e50 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -22,7 +22,7 @@ else key: '_gitlab_session', secure: Gitlab.config.gitlab.https, 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 ) end |