summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-05-02 17:22:03 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-05-02 17:22:03 +0200
commitdc0ff9a17472c71d2e2f5510797976f9ce7cea23 (patch)
tree5828d9539a1b82bac9ac9f6dfec4dd9e61c9a293
parent15a2c558022908e23f0ff6ac80a135899aa0899a (diff)
downloadgitlab-ce-dc0ff9a17472c71d2e2f5510797976f9ce7cea23.tar.gz
Fix "remember me" sign in option
-rw-r--r--config/initializers/session_store.rb2
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