Merge branch 'test_env_cache' into 'master'
Disabling cache for test environment See merge request !1807
This commit is contained in:
commit
9179fcece8
2 changed files with 13 additions and 9 deletions
|
@ -30,4 +30,6 @@ Gitlab::Application.configure do
|
|||
config.active_support.deprecation = :stderr
|
||||
|
||||
config.eager_load = false
|
||||
|
||||
config.cache_store = :null_store
|
||||
end
|
||||
|
|
|
@ -9,12 +9,14 @@ begin
|
|||
rescue
|
||||
end
|
||||
|
||||
Gitlab::Application.config.session_store(
|
||||
: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
|
||||
key: '_gitlab_session',
|
||||
secure: Gitlab.config.gitlab.https,
|
||||
httponly: true,
|
||||
expire_after: Settings.gitlab['session_expire_delay'] * 60,
|
||||
path: (Gitlab::Application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root
|
||||
)
|
||||
unless Rails.env.test?
|
||||
Gitlab::Application.config.session_store(
|
||||
: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
|
||||
key: '_gitlab_session',
|
||||
secure: Gitlab.config.gitlab.https,
|
||||
httponly: true,
|
||||
expire_after: Settings.gitlab['session_expire_delay'] * 60,
|
||||
path: (Gitlab::Application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root
|
||||
)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue