diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-12 13:47:30 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-12 13:47:30 -0500 |
| commit | b8401cd0b201ab9caecb60dcc477637e70da4df9 (patch) | |
| tree | e197770a94a39ea4956007503440d13cf0b5434e /app/controllers/admin/application_settings_controller.rb | |
| parent | b75f9721df6c7f5231a9d19e38ec8f0395957c0d (diff) | |
| parent | 7f01d49b69130343d95d7ec470d69aeb14fb94fe (diff) | |
| download | gitlab-ce-b8401cd0b201ab9caecb60dcc477637e70da4df9.tar.gz | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 4dfb397e82c..145f74d9e59 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -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 |