diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-16 00:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-16 00:09:18 +0300 |
| commit | 2eda658f34763b651b198365550c67d073439a12 (patch) | |
| tree | a11bb3761fd8dd2ac76855810efbdc4d1ecc74ba /lib/gitlab/current_settings.rb | |
| parent | 09093c1278f2b3347465bf5939fda215592f0d1f (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, 1 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 891fd8c1bb5..2b08d3c63bb 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -43,7 +43,7 @@ module Gitlab end def uncached_application_settings - return fake_application_settings unless connect_to_db? + return fake_application_settings if Gitlab::Runtime.rake? && !connect_to_db? current_settings = ::ApplicationSetting.current # If there are pending migrations, it's possible there are columns that |