diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 18:07:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 18:07:32 +0300 |
| commit | db19df23733c768c564534a09de2e6718097ec95 (patch) | |
| tree | f148eb0723f20a2442e0274089d567e1810ee8d2 /lib/gitlab/current_settings.rb | |
| parent | d2199d74936cd5cb9f45f569f723a5370ae5013e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/current_settings.rb')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 0d6767ad564..8ef4977177a 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -70,6 +70,8 @@ module Gitlab else ::ApplicationSetting.create_from_defaults end + rescue ::ApplicationSetting::Recursion + in_memory_application_settings end def fake_application_settings(attributes = {}) |