Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-09-07 10:21:30 +0300
committerJan Provaznik <jprovaznik@gitlab.com>2018-09-11 19:14:37 +0300
commit1b42c847bc4d727f0c9c78f326ce2f34d22494da (patch)
treed4524d3d9619ea0d88509755d4e03de46ed06792 /config/environments
parentb21625a9783e75365a309a8e48b06a1494fc3680 (diff)
Fix rails 5 deprecation warnings
Fixes rails 5 deprecation warnings in `config/` files
Diffstat (limited to 'config/environments')
-rw-r--r--config/environments/test.rb4
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