diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 18:10:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 18:10:04 +0300 |
commit | 68d7192881c41305da9c6aa1e3f7dd8b47f286a7 (patch) | |
tree | 015aae6f32b30437718e76c663e8383a4a4d8a22 /config/environments | |
parent | 96acc69fae1ee7d559ba7eaa4e8304c8261525e3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/environments')
-rw-r--r-- | config/environments/production.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index e1a7db8d860..f1d6b6c8bbc 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -54,6 +54,9 @@ 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 |