Commit 955f0ea5 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'patch-28' into 'master'

Update wrong initial setting transfer in application_settings_controller.rb

See merge request gitlab-org/gitlab-ce!20059
parents 1bc73753 6d2b934d
...@@ -52,7 +52,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -52,7 +52,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
private private
def set_application_setting def set_application_setting
@application_setting = ApplicationSetting.current_without_cache @application_setting = Gitlab::CurrentSettings.current_application_settings
end end
def application_setting_params def application_setting_params
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment