Commit fc7d76ae authored by Douwe Maan's avatar Douwe Maan

Merge branch 'blackst0ne-rails5-fix-application-settings-controller' into 'master'

[Rails5] Fix admin/application_settings_controller

See merge request gitlab-org/gitlab-ce!18275
parents 863e1a7a ac1b5def
...@@ -56,7 +56,9 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -56,7 +56,9 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
end end
def application_setting_params def application_setting_params
params[:application_setting] ||= {}
import_sources = params[:application_setting][:import_sources] import_sources = params[:application_setting][:import_sources]
if import_sources.nil? if import_sources.nil?
params[:application_setting][:import_sources] = [] params[:application_setting][:import_sources] = []
else else
......
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