diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-12-14 17:45:14 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-19 13:24:54 +0300 |
| commit | 0ff27ce05960598e5a1c0a1115180db0feeb689a (patch) | |
| tree | 2ae5e499696fee4f080ad62b7f50b302772dbfed /lib/gitlab/current_settings.rb | |
| parent | cc5099c5ce79a7c062e2197b47f5f8a81bb48292 (diff) | |
Method `create_from_defaults` will never give nil
Diffstat (limited to 'lib/gitlab/current_settings.rb')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 570bfb80fba..552aad83dd4 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -51,8 +51,7 @@ module Gitlab elsif current_settings.present? current_settings else - ::ApplicationSetting.create_from_defaults || - in_memory_application_settings + ::ApplicationSetting.create_from_defaults end end |