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:
commit
fc7d76ae58
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue