kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

[Rails5] Fix admin/application_settings_controller

See merge request gitlab-org/gitlab-ce!18275
This commit is contained in:
Douwe Maan 2018-04-11 07:45:22 +00:00
parent 863e1a7a05 ac1b5def53
commit fc7d76ae58
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/application_settings_controller.rb
View File

@ -56,7 +56,9 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
end
def application_setting_params
params[:application_setting] ||= {}
import_sources = params[:application_setting][:import_sources]
if import_sources.nil?
params[:application_setting][:import_sources] = []
else