diff options
Diffstat (limited to 'config/environments')
-rw-r--r-- | config/environments/development.rb | 2 | ||||
-rw-r--r-- | config/environments/test.rb | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 92de88394c6..076957f3057 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -42,8 +42,6 @@ Rails.application.configure do # Raises helpful error messages. config.assets.raise_runtime_errors = true - # For having correct urls in mails - config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } # Open sent mails in browser config.action_mailer.delivery_method = :letter_opener_web # Log mail delivery errors diff --git a/config/environments/test.rb b/config/environments/test.rb index 9fa8a1b762c..2935e0c7636 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -49,7 +49,7 @@ Rails.application.configure do # Print deprecation notices to the stderr config.active_support.deprecation = :stderr - config.eager_load = Gitlab::Utils.to_boolean(ENV['GITLAB_TEST_EAGER_LOAD'], default: true) + config.eager_load = Gitlab::Utils.to_boolean(ENV['GITLAB_TEST_EAGER_LOAD'], default: ENV['CI'].present?) config.cache_store = :null_store @@ -59,8 +59,4 @@ Rails.application.configure do config.logger = ActiveSupport::TaggedLogging.new(Logger.new(nil)) config.log_level = :fatal end - - # Mount the ActionCable Engine in-app so that we don't have to spawn another Puma - # process for feature specs - ENV['ACTION_CABLE_IN_APP'] = 'true' end |