diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-09-07 09:21:30 +0200 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-09-11 18:14:37 +0200 |
| commit | 1b42c847bc4d727f0c9c78f326ce2f34d22494da (patch) | |
| tree | d4524d3d9619ea0d88509755d4e03de46ed06792 /config/environments/test.rb | |
| parent | b21625a9783e75365a309a8e48b06a1494fc3680 (diff) | |
| download | gitlab-ce-1b42c847bc4d727f0c9c78f326ce2f34d22494da.tar.gz | |
Fix rails 5 deprecation warnings
Fixes rails 5 deprecation warnings in `config/` files
Diffstat (limited to 'config/environments/test.rb')
| -rw-r--r-- | config/environments/test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb index af1011a1ab1..072f93150a3 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -21,12 +21,12 @@ Rails.application.configure do 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.static_cache_control = "public, max-age=3600" - # Show full error reports and disable caching config.consider_all_requests_local = true config.action_controller.perform_caching = false |