summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-25 12:49:27 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-25 12:49:27 +0000
commitc797493e00bf3adf32beb0c0b1cee9d19974485f (patch)
tree1248cac9dc55d5ff01294fcaa0bf27f813e7e612
parent73af33e4b1aed1cbde3644a0e94ab2d40340e31b (diff)
parentc447a2131d864cb715c0fb9ba562db67ade2f7c6 (diff)
downloadgitlab-ce-c797493e00bf3adf32beb0c0b1cee9d19974485f.tar.gz
Merge branch 'session_store' of /home/git/repositories/gitlab/gitlabhq
-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 467f9477392..f80b67a554b 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -4,7 +4,7 @@ Gitlab::Application.config.session_store(
:redis_store, # Using the cookie_store would enable session replay attacks.
servers: Gitlab::Application.config.cache_store.last, # re-use the Redis config from the Rails cache store
key: '_gitlab_session',
- secure: Gitlab::Application.config.force_ssl,
+ secure: Gitlab.config.gitlab.https,
httponly: true,
path: (Rails.application.config.relative_url_root.nil?) ? '/' : Rails.application.config.relative_url_root
)