Download as
Browse Code »

Commit ede272406a36d8263ababd7aab86ece5d9a9b9b5

Authored by Dmitriy Zaporozhets
1 parent f38435b9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
  Diff comments   View file @ede2724
... ... @@ -6,9 +6,6 @@ Gitlab::Application.configure do
6 6 # since you don't have to restart the web server when you make code changes.
7 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 9 # Show full error reports and disable caching
13 10 config.consider_all_requests_local = true
14 11 config.action_controller.perform_caching = false
... ... @@ -25,10 +22,6 @@ Gitlab::Application.configure do
25 22 # Raise exception on mass assignment protection for Active Record models
26 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 25 # Do not compress assets
33 26 config.assets.compress = false
34 27  
... ... @@ -39,4 +32,6 @@ Gitlab::Application.configure do
39 32 config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
40 33 # Open sent mails in browser
41 34 config.action_mailer.delivery_method = :letter_opener
  35 +
  36 + config.eager_load = false
42 37 end
... ...
config/environments/production.rb
  Diff comments   View file @ede2724
... ... @@ -80,4 +80,7 @@ Gitlab::Application.configure do
80 80 # # }
81 81 config.action_mailer.perform_deliveries = true
82 82 config.action_mailer.raise_delivery_errors = true
  83 +
  84 + config.eager_load = true
  85 + config.assets.js_compressor = :uglifier
83 86 end
... ...
config/environments/test.rb
  Diff comments   View file @ede2724
... ... @@ -34,4 +34,6 @@ Gitlab::Application.configure do
34 34  
35 35 # Print deprecation notices to the stderr
36 36 config.active_support.deprecation = :stderr
  37 +
  38 + config.eager_load = false
37 39 end
... ...