Commit 7fab63b4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'namespace_redis_cache' into 'master'

Give the Rails cache its own Redis namespace
parents 14c96749 8d78662e
...@@ -17,6 +17,7 @@ v 6.8.0 ...@@ -17,6 +17,7 @@ v 6.8.0
- Fix download link for huge MR diffs - Fix download link for huge MR diffs
- Expose event and mergerequest timestamps in API - Expose event and mergerequest timestamps in API
- Fix emails on push service when only one commit is pushed - Fix emails on push service when only one commit is pushed
- Store Rails cache data in the Redis `cache:gitlab` namespace
v 6.7.3 v 6.7.3
- Fix the merge notification email not being sent (Pierre de La Morinerie) - Fix the merge notification email not being sent (Pierre de La Morinerie)
......
...@@ -53,7 +53,7 @@ Gitlab::Application.configure do ...@@ -53,7 +53,7 @@ Gitlab::Application.configure do
else else
"redis://localhost:6379" "redis://localhost:6379"
end end
config.cache_store = :redis_store, resque_url config.cache_store = :redis_store, resque_url, {namespace: 'cache:gitlab'}
# Enable serving of images, stylesheets, and JavaScripts from an asset server # Enable serving of images, stylesheets, and JavaScripts from an asset server
# config.action_controller.asset_host = "http://assets.example.com" # config.action_controller.asset_host = "http://assets.example.com"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Gitlab::Application.config.session_store( 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[1], # re-use the Redis config from the Rails cache store
key: '_gitlab_session', key: '_gitlab_session',
secure: Gitlab.config.gitlab.https, secure: Gitlab.config.gitlab.https,
httponly: true, httponly: true,
......
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