diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-10 17:34:12 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-10 17:34:12 +0300 |
| commit | 4e5897f51ef97d7c3ff6c57f81521f552979a3da (patch) | |
| tree | ef0655df13cef6c267ea3e547d497f92498142ed /config | |
| parent | 3bfedbd25a933d59defbb0875fb80758919df4a6 (diff) | |
| parent | 10387f6b8a9071688d7db9a12c910ca02660ca87 (diff) | |
Merge branch 'tmp-reference-pipeline-and-caching' into 'master'
[Second try] Implement different Markdown rendering pipelines and cache Markdown
!1602 already got merged in bcd89a58e736685bcce662fe0acf793ee925b536, but it would appear the merge commit disappeared because of #3816 (or some other reason).
cc @rspeicher
See merge request !2051
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/test.rb | 2 | ||||
| -rw-r--r-- | config/initializers/session_store.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb index f96ac6f9753..d6842affa6c 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -7,6 +7,8 @@ Rails.application.configure do # and recreated between test runs. Don't rely on the data there! config.cache_classes = false + config.cache_store = :null_store + # Configure static asset server for tests with Cache-Control for performance config.serve_static_files = true config.static_cache_control = "public, max-age=3600" diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index d5208b8c93e..0fc725842ba 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -10,7 +10,9 @@ rescue Settings.gitlab['session_expire_delay'] ||= 10080 end -unless Rails.env.test? +if Rails.env.test? + Gitlab::Application.config.session_store :cookie_store, key: "_gitlab_session" +else Gitlab::Application.config.session_store( :redis_store, # Using the cookie_store would enable session replay attacks. servers: Rails.application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store |