diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-28 21:07:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-28 21:07:56 +0300 |
| commit | 1b6c8b34c1301ece8383b4a7950270a757304c0b (patch) | |
| tree | fcdd5518b2e7b9d2308797e3203eb8a47c813b56 /config/application.rb | |
| parent | b213b675ec1d6fa633497c5f71c195f00b56be6d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/config/application.rb b/config/application.rb index 76541daa9e1..b07af18d9c9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -69,18 +69,19 @@ module Gitlab require_dependency Rails.root.join('lib/gitlab/middleware/handle_malformed_strings') require_dependency Rails.root.join('lib/gitlab/middleware/rack_multipart_tempfile_factory') require_dependency Rails.root.join('lib/gitlab/runtime') - require_dependency Rails.root.join('lib/gitlab/patch/legacy_database_config') + require_dependency Rails.root.join('lib/gitlab/patch/database_config') require_dependency Rails.root.join('lib/gitlab/exceptions_app') config.exceptions_app = Gitlab::ExceptionsApp.new(Rails.public_path) - # To be removed in 15.0 - # This preload is needed to convert legacy `database.yml` - # from `production: adapter: postgresql` - # into a `production: main: adapter: postgresql` - unless Gitlab::Utils.to_boolean(ENV['SKIP_DATABASE_CONFIG_VALIDATION'], default: false) - config.class.prepend(::Gitlab::Patch::LegacyDatabaseConfig) - end + # This preload is required to: + # + # 1. Convert legacy `database.yml`; + # 2. Include Geo post-deployment migrations settings; + # + # TODO: In 15.0, this preload can be wrapped in a Gitlab.ee block + # since we don't need to convert legacy `database.yml` anymore. + config.class.prepend(::Gitlab::Patch::DatabaseConfig) # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers |