Merge branch 'session_store' of /home/git/repositories/gitlab/gitlabhq
This commit is contained in:
commit
c797493e00
|
@ -4,7 +4,7 @@ Gitlab::Application.config.session_store(
|
||||||
:redis_store, # Using the cookie_store would enable session replay attacks.
|
: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
|
servers: Gitlab::Application.config.cache_store.last, # re-use the Redis config from the Rails cache store
|
||||||
key: '_gitlab_session',
|
key: '_gitlab_session',
|
||||||
secure: Gitlab::Application.config.force_ssl,
|
secure: Gitlab.config.gitlab.https,
|
||||||
httponly: true,
|
httponly: true,
|
||||||
path: (Rails.application.config.relative_url_root.nil?) ? '/' : Rails.application.config.relative_url_root
|
path: (Rails.application.config.relative_url_root.nil?) ? '/' : Rails.application.config.relative_url_root
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue