diff options
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/development.rb | 2 | ||||
| -rw-r--r-- | config/environments/production.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 50d394859bc..92de88394c6 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -50,7 +50,7 @@ Rails.application.configure do config.action_mailer.raise_delivery_errors = true # Don't make a mess when bootstrapping a development environment config.action_mailer.perform_deliveries = (ENV['BOOTSTRAP'] != '1') - config.action_mailer.preview_path = 'app/mailers/previews' + config.action_mailer.preview_path = "#{Rails.root}{/ee,}/app/mailers/previews" config.eager_load = false diff --git a/config/environments/production.rb b/config/environments/production.rb index f1d6b6c8bbc..e1a7db8d860 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -54,9 +54,6 @@ Rails.application.configure do # Enable serving of images, stylesheets, and JavaScripts from an asset server config.action_controller.asset_host = ENV['GITLAB_CDN_HOST'] if ENV['GITLAB_CDN_HOST'].present? - # We use a env var to keep at old default until we enable this for GitLab.com - config.active_record.legacy_connection_handling = !Gitlab::Utils.to_boolean(ENV.fetch('ENABLE_RAILS_61_CONNECTION_HANDLING', false)) - # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false |