diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-04-11 12:33:11 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-04-11 12:33:11 +1100 |
| commit | ac1b5def53b949db0245c8c8b4a2eddd5011ccc8 (patch) | |
| tree | 83020930402dd27d0b7e6f083c87245138fc43e7 /app/controllers/admin | |
| parent | 6b246360d4ef358cced8b2c698a1d00f97a2e780 (diff) | |
| download | gitlab-ce-ac1b5def53b949db0245c8c8b4a2eddd5011ccc8.tar.gz | |
[Rails5] Fix admin/application_settings_controller
The `RAILS5=1 rspec spec/controllers/admin/application_settings_controller_spec.rb`
command throws the error:
Failures:
1) Admin::ApplicationSettingsController PUT #update falls back to defaults when settings are omitted
Failure/Error: import_sources = params[:application_setting][:import_sources]
NoMethodError:
undefined method `[]' for nil:NilClass
# ./app/controllers/admin/application_settings_controller.rb:62:in `application_setting_params'
This commit fixes it.
Diffstat (limited to 'app/controllers/admin')
| -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 |