Commit 9179fcec authored by Valery Sizov's avatar Valery Sizov

Merge branch 'test_env_cache' into 'master'

Disabling cache for test environment



See merge request !1807
parents 6c8dded2 9e0d443f
...@@ -30,4 +30,6 @@ Gitlab::Application.configure do ...@@ -30,4 +30,6 @@ Gitlab::Application.configure do
config.active_support.deprecation = :stderr config.active_support.deprecation = :stderr
config.eager_load = false config.eager_load = false
config.cache_store = :null_store
end end
...@@ -9,7 +9,8 @@ begin ...@@ -9,7 +9,8 @@ begin
rescue rescue
end end
Gitlab::Application.config.session_store( unless Rails.env.test?
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[1].merge(namespace: 'session:gitlab'), # 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', key: '_gitlab_session',
...@@ -17,4 +18,5 @@ Gitlab::Application.config.session_store( ...@@ -17,4 +18,5 @@ Gitlab::Application.config.session_store(
httponly: true, httponly: true,
expire_after: Settings.gitlab['session_expire_delay'] * 60, expire_after: Settings.gitlab['session_expire_delay'] * 60,
path: (Gitlab::Application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root path: (Gitlab::Application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root
) )
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment