diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-03-26 15:33:56 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-03-26 23:02:57 +0100 |
| commit | 90718774e19d333a64f6625f0ac23b8508f37e56 (patch) | |
| tree | 7f135a424cdaf291fe6612168d4e47098bf17737 /lib | |
| parent | 81fe9e9b2e670cc7dcd9405e336f72cabc5a14ba (diff) | |
| download | gitlab-ce-90718774e19d333a64f6625f0ac23b8508f37e56.tar.gz | |
Use a Gitlab::FakeApplicationSettings when migrations are pending
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 552aad83dd4..469a7fd9f7b 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -47,7 +47,7 @@ module Gitlab # defaults for missing columns. if ActiveRecord::Migrator.needs_migration? db_attributes = current_settings&.attributes || {} - ::ApplicationSetting.build_from_defaults(db_attributes) + fake_application_settings(db_attributes) elsif current_settings.present? current_settings else |