diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-14 07:07:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-14 07:07:25 +0000 |
| commit | b32b6d6c26011ff631c4dc97940f1d80bb4deea9 (patch) | |
| tree | ea0f5697fb60f7033b878b808c874e2e0984dcd2 | |
| parent | 001602b8a824fc28f81eede641ad289f867cb98f (diff) | |
| parent | 71e0d33e74fb5c571032be641130105fd3f6a4b6 (diff) | |
| download | gitlab-ce-b32b6d6c26011ff631c4dc97940f1d80bb4deea9.tar.gz | |
Merge branch 'rails5-fix-47805' into 'master'
Rails5 ActionController::ParameterMissing: param is missing or the value is…
Closes #47805
See merge request gitlab-org/gitlab-ce!19763
| -rw-r--r-- | changelogs/unreleased/rails5-fix-47805.yml | 6 | ||||
| -rw-r--r-- | spec/controllers/admin/application_settings_controller_spec.rb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/rails5-fix-47805.yml b/changelogs/unreleased/rails5-fix-47805.yml new file mode 100644 index 00000000000..8bd8ad5488c --- /dev/null +++ b/changelogs/unreleased/rails5-fix-47805.yml @@ -0,0 +1,6 @@ +--- +title: 'Rails5 ActionController::ParameterMissing: param is missing or the value is + empty: application_setting' +merge_request: 19763 +author: Jasper Maes +type: fixed diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb index b4fc2aa326f..9d10d725ff3 100644 --- a/spec/controllers/admin/application_settings_controller_spec.rb +++ b/spec/controllers/admin/application_settings_controller_spec.rb @@ -73,7 +73,7 @@ describe Admin::ApplicationSettingsController do end it 'updates the restricted_visibility_levels when empty array is passed' do - put :update, application_setting: { restricted_visibility_levels: [] } + put :update, application_setting: { restricted_visibility_levels: [""] } expect(response).to redirect_to(admin_application_settings_path) expect(ApplicationSetting.current.restricted_visibility_levels).to be_empty |