diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-05-25 23:56:17 +0200 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-05-25 23:56:17 +0200 |
| commit | 95a63a881673533e3fd44243297d1a81e19396b6 (patch) | |
| tree | 9a3190b813e2d599043394b30afaa5a5c8f8e565 /lib/api/v3/settings.rb | |
| parent | 48e46f959716c8915f5b59d1314b5e5781f3cd8d (diff) | |
| parent | 50c8ed2bf498c69d3d52ba1451274e3fbf438429 (diff) | |
| download | gitlab-ce-95a63a881673533e3fd44243297d1a81e19396b6.tar.gz | |
Merge remote-tracking branch 'origin/master' into 38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster
Diffstat (limited to 'lib/api/v3/settings.rb')
| -rw-r--r-- | lib/api/v3/settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/v3/settings.rb b/lib/api/v3/settings.rb index 9b4ab7630fb..fc56495c8b1 100644 --- a/lib/api/v3/settings.rb +++ b/lib/api/v3/settings.rb @@ -6,7 +6,7 @@ module API helpers do def current_settings @current_setting ||= - (ApplicationSetting.current || ApplicationSetting.create_from_defaults) + (ApplicationSetting.current_without_cache || ApplicationSetting.create_from_defaults) end end |