diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-11 16:45:56 +0200 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-01-08 20:34:19 +0000 |
| commit | bcffeade9df825d40a4fe9cf9c1401b326c1fa9e (patch) | |
| tree | d799d976b9feb194b5071f2d79dde21ee5c2daf6 | |
| parent | 07bd79cd721a13fc012b77b09e56cd709e5a22f3 (diff) | |
| download | gitlab-ce-bcffeade9df825d40a4fe9cf9c1401b326c1fa9e.tar.gz | |
Use ApplicationSetting.current in Admin::ApplicationSettingsController
See merge request gitlab-org/gitlab-ee!3323
Backported as part of authorized_keys in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16014
| -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 4de808eb71f..4dfb397e82c 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 = current_application_settings + @application_setting = ApplicationSetting.current end def application_setting_params |