diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-08 17:26:47 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-08 17:26:47 +0000 |
| commit | c3eb2458749952e6cca4d1a1a49351f98f7feeaf (patch) | |
| tree | f8984550db63b2a7ec9ab9b984007c99d1306e39 /config | |
| parent | f2209c98b2ac5806b0ec0888dc393ae0406a08a6 (diff) | |
| parent | 9c593a51c377f474f1aac1ed16b1dc8eafc6f6d9 (diff) | |
| download | gitlab-ce-c3eb2458749952e6cca4d1a1a49351f98f7feeaf.tar.gz | |
Merge branch 'remove-duplicate-cache_store-in-test-config' into 'master'
Remove duplicate 'cache_store' configuration in test environment
[ci skip]
See merge request !3061
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/test.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb index d6842affa6c..f96ac6f9753 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -7,8 +7,6 @@ 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" |