Commit ede272406a36d8263ababd7aab86ece5d9a9b9b5
1 parent
f38435b9
Exists in
master
and in
4 other branches
Update config/* to rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
3 changed files
with
7 additions
and
7 deletions
Show diff stats
config/environments/development.rb
| @@ -6,9 +6,6 @@ Gitlab::Application.configure do | @@ -6,9 +6,6 @@ Gitlab::Application.configure do | ||
| 6 | # since you don't have to restart the web server when you make code changes. | 6 | # since you don't have to restart the web server when you make code changes. |
| 7 | config.cache_classes = false | 7 | config.cache_classes = false |
| 8 | 8 | ||
| 9 | - # Log error messages when you accidentally call methods on nil. | ||
| 10 | - config.whiny_nils = true | ||
| 11 | - | ||
| 12 | # Show full error reports and disable caching | 9 | # Show full error reports and disable caching |
| 13 | config.consider_all_requests_local = true | 10 | config.consider_all_requests_local = true |
| 14 | config.action_controller.perform_caching = false | 11 | config.action_controller.perform_caching = false |
| @@ -25,10 +22,6 @@ Gitlab::Application.configure do | @@ -25,10 +22,6 @@ Gitlab::Application.configure do | ||
| 25 | # Raise exception on mass assignment protection for Active Record models | 22 | # Raise exception on mass assignment protection for Active Record models |
| 26 | config.active_record.mass_assignment_sanitizer = :strict | 23 | config.active_record.mass_assignment_sanitizer = :strict |
| 27 | 24 | ||
| 28 | - # Log the query plan for queries taking more than this (works | ||
| 29 | - # with SQLite, MySQL, and PostgreSQL) | ||
| 30 | - config.active_record.auto_explain_threshold_in_seconds = 0.5 | ||
| 31 | - | ||
| 32 | # Do not compress assets | 25 | # Do not compress assets |
| 33 | config.assets.compress = false | 26 | config.assets.compress = false |
| 34 | 27 | ||
| @@ -39,4 +32,6 @@ Gitlab::Application.configure do | @@ -39,4 +32,6 @@ Gitlab::Application.configure do | ||
| 39 | config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } | 32 | config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } |
| 40 | # Open sent mails in browser | 33 | # Open sent mails in browser |
| 41 | config.action_mailer.delivery_method = :letter_opener | 34 | config.action_mailer.delivery_method = :letter_opener |
| 35 | + | ||
| 36 | + config.eager_load = false | ||
| 42 | end | 37 | end |
config/environments/production.rb
| @@ -80,4 +80,7 @@ Gitlab::Application.configure do | @@ -80,4 +80,7 @@ Gitlab::Application.configure do | ||
| 80 | # # } | 80 | # # } |
| 81 | config.action_mailer.perform_deliveries = true | 81 | config.action_mailer.perform_deliveries = true |
| 82 | config.action_mailer.raise_delivery_errors = true | 82 | config.action_mailer.raise_delivery_errors = true |
| 83 | + | ||
| 84 | + config.eager_load = true | ||
| 85 | + config.assets.js_compressor = :uglifier | ||
| 83 | end | 86 | end |
config/environments/test.rb
| @@ -34,4 +34,6 @@ Gitlab::Application.configure do | @@ -34,4 +34,6 @@ Gitlab::Application.configure do | ||
| 34 | 34 | ||
| 35 | # Print deprecation notices to the stderr | 35 | # Print deprecation notices to the stderr |
| 36 | config.active_support.deprecation = :stderr | 36 | config.active_support.deprecation = :stderr |
| 37 | + | ||
| 38 | + config.eager_load = false | ||
| 37 | end | 39 | end |