diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-12-14 22:42:07 +0800 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-19 11:24:54 +0100 |
| commit | cc5099c5ce79a7c062e2197b47f5f8a81bb48292 (patch) | |
| tree | 379058dc0f48c627767e02c8787e42dd19808880 /lib/gitlab/current_settings.rb | |
| parent | 1ae28e0e7b5996536e4c8005c362d3f82088c77c (diff) | |
| download | gitlab-ce-cc5099c5ce79a7c062e2197b47f5f8a81bb48292.tar.gz | |
Move schema aware defaults to build_from_defaults
This way we can reuse the safe setting
Diffstat (limited to 'lib/gitlab/current_settings.rb')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 168542f77e6..570bfb80fba 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -47,14 +47,7 @@ module Gitlab # defaults for missing columns. if ActiveRecord::Migrator.needs_migration? db_attributes = current_settings&.attributes || {} - column_names = ::ApplicationSetting.column_names - final_attributes = ::ApplicationSetting - .defaults - .merge(db_attributes) - .stringify_keys - .slice(*column_names) - - ::ApplicationSetting.new(final_attributes) + ::ApplicationSetting.build_from_defaults(db_attributes) elsif current_settings.present? current_settings else |