diff options
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config/application.rb b/config/application.rb index 12c7444ef39..0634bbf5165 100644 --- a/config/application.rb +++ b/config/application.rb @@ -92,11 +92,8 @@ module Gitlab # This preload is required to: # - # 1. Convert legacy `database.yml`; + # 1. Support providing sensitive DB configuration through an external script; # 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. |