Commit c3eb2458 authored by Robert Speicher's avatar Robert Speicher

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
parents f2209c98 9c593a51
...@@ -7,8 +7,6 @@ Rails.application.configure do ...@@ -7,8 +7,6 @@ Rails.application.configure do
# and recreated between test runs. Don't rely on the data there! # and recreated between test runs. Don't rely on the data there!
config.cache_classes = false config.cache_classes = false
config.cache_store = :null_store
# Configure static asset server for tests with Cache-Control for performance # Configure static asset server for tests with Cache-Control for performance
config.serve_static_files = true config.serve_static_files = true
config.static_cache_control = "public, max-age=3600" config.static_cache_control = "public, max-age=3600"
......
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