Merge branch...

Merge branch 'rc/use-application_setting-current-in-admin-application_settings_controller' into 'master'

Use ApplicationSetting.current in Admin::ApplicationSettingsController

See merge request gitlab-org/gitlab-ee!3323

app/controllers/admin/application_settings_controller.rb

@@ -54,7 +54,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