summaryrefslogtreecommitdiff
path: root/config/environments
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-12-07 19:15:06 +0100
committerJasper Maes <jaspermaes.jm@gmail.com>2018-12-14 19:36:22 +0100
commit44fef4fe4cb9d4f30f129ff5a548395bc924c8fe (patch)
treeac5e97a16658edfb25b8407f1cf2d9a11c172667 /config/environments
parenteafc8e2f481751b973260287c844b70bd408dcb2 (diff)
downloadgitlab-ce-44fef4fe4cb9d4f30f129ff5a548395bc924c8fe.tar.gz
Remove rails 4 support in CI, Gemfiles, bin/ and config/
Diffstat (limited to 'config/environments')
-rw-r--r--config/environments/production.rb6
-rw-r--r--config/environments/test.rb9
2 files changed, 3 insertions, 12 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 49a4e873093..09bcf49a9a5 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -9,11 +9,7 @@ Rails.application.configure do
config.action_controller.perform_caching = true
# Disable Rails's static asset server (Apache or nginx will already do this)
- if Gitlab.rails5?
- config.public_file_server.enabled = false
- else
- config.serve_static_files = false
- end
+ config.public_file_server.enabled = false
# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
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