summaryrefslogtreecommitdiff
path: root/config/environments
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-06 17:04:18 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-10 12:11:27 +0200
commitede272406a36d8263ababd7aab86ece5d9a9b9b5 (patch)
tree8b649119729c1c8909f0bcd8a8dd6b9ae0758655 /config/environments
parentf38435b9e79cc155bc725300a5aa920f17c69271 (diff)
downloadgitlab-ce-ede272406a36d8263ababd7aab86ece5d9a9b9b5.tar.gz
Update config/* to rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'config/environments')
-rw-r--r--config/environments/development.rb9
-rw-r--r--config/environments/production.rb3
-rw-r--r--config/environments/test.rb2
3 files changed, 7 insertions, 7 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6cba17f6ea2..e4c7649fda0 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -6,9 +6,6 @@ Gitlab::Application.configure do
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
- # Log error messages when you accidentally call methods on nil.
- config.whiny_nils = true
-
# Show full error reports and disable caching
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
@@ -25,10 +22,6 @@ Gitlab::Application.configure do
# Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict
- # Log the query plan for queries taking more than this (works
- # with SQLite, MySQL, and PostgreSQL)
- config.active_record.auto_explain_threshold_in_seconds = 0.5
-
# Do not compress assets
config.assets.compress = false
@@ -39,4 +32,6 @@ Gitlab::Application.configure do
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
# Open sent mails in browser
config.action_mailer.delivery_method = :letter_opener
+
+ config.eager_load = false
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e3476be8fba..00322cdbad3 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -80,4 +80,7 @@ Gitlab::Application.configure do
# # }
config.action_mailer.perform_deliveries = true
config.action_mailer.raise_delivery_errors = true
+
+ config.eager_load = true
+ config.assets.js_compressor = :uglifier
end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index b626986299b..2f135b6e149 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -34,4 +34,6 @@ Gitlab::Application.configure do
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
+
+ config.eager_load = false
end