diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-26 10:39:32 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-26 10:39:32 +0000 |
| commit | 955f0ea57f3ab3cc06124ecea795c1375b3eb92f (patch) | |
| tree | 2129fa36b200c277791051b50ad2008884bbfee5 | |
| parent | 1bc7375385cf7eb2101b6f84f8177fee612cd6d2 (diff) | |
| parent | 6d2b934d449340e82d4f7d75ccd0e0d166972c57 (diff) | |
| download | gitlab-ce-955f0ea57f3ab3cc06124ecea795c1375b3eb92f.tar.gz | |
Merge branch 'patch-28' into 'master'
Update wrong initial setting transfer in application_settings_controller.rb
See merge request gitlab-org/gitlab-ce!20059
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index cdfe3d6ab1e..9723e400574 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -52,7 +52,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController private def set_application_setting - @application_setting = ApplicationSetting.current_without_cache + @application_setting = Gitlab::CurrentSettings.current_application_settings end def application_setting_params |