Merge branch 'master' of github.com:gitlabhq/gitlabhq

Dmitriy Zaporozhets
2 parents 1040e88e 70a9c377
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
config/initializers/session_store.rb
@@ -2,6 +2,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,
   httponly: true,
...	...	@@ -2,6 +2,7 @@
2	2
3	3	Gitlab::Application.config.session_store(
4	4	:redis_store, # Using the cookie_store would enable session replay attacks.
	5	+ servers: Gitlab::Application.config.cache_store.last, # re-use the Redis config from the Rails cache store
5	6	key: '_gitlab_session',
6	7	secure: Gitlab::Application.config.force_ssl,
7	8	httponly: true,
...	...