diff options
Diffstat (limited to 'config/environments/test.rb')
| -rw-r--r-- | config/environments/test.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb index 072f93150a3..3461099253a 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -19,13 +19,8 @@ Rails.application.configure do # Configure static asset server for tests with Cache-Control for performance config.assets.compile = false if ENV['CI'] - if Gitlab.rails5? - config.public_file_server.enabled = true - config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' } - else - config.serve_static_files = true - config.static_cache_control = "public, max-age=3600" - end + config.public_file_server.enabled = true + config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' } # Show full error reports and disable caching config.consider_all_requests_local = true |