diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-28 15:03:22 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-28 15:03:22 +0300 |
| commit | c1d2640b2ea5aec67401ef17ae8e637677aa5d7f (patch) | |
| tree | 4e043ee0dcf2ee1e982fbb1807e369762345048c /config/initializers/session_store.rb | |
| parent | db88190636456a84db747a3f9335a55ca9819274 (diff) | |
| parent | fc62664146458f023c5573d7e6dead5f11c6fd4b (diff) | |
| download | gitlab-ce-c1d2640b2ea5aec67401ef17ae8e637677aa5d7f.tar.gz | |
Merge branch 'redis_settings'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
Diffstat (limited to 'config/initializers/session_store.rb')
| -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 b3fa648f2a6..b2d59f1c4b7 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -2,7 +2,7 @@ Gitlab::Application.config.session_store( :redis_store, # Using the cookie_store would enable session replay attacks. - servers: Gitlab::Application.config.cache_store[1], # re-use the Redis config from the Rails cache store + servers: Gitlab::Application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store key: '_gitlab_session', secure: Gitlab.config.gitlab.https, httponly: true, |