diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-27 21:06:41 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-02-27 21:06:41 +0000 |
| commit | b895c4eff9d0dcf857257025d35f4c24e9269130 (patch) | |
| tree | 981fd88fce34fd5df4c7b94e0b4dd01f5db70e1b | |
| parent | d844721c30be23188d2ce3047001df8ef641968c (diff) | |
| parent | 52c79319ca431b02bccf696001565d5486f467b9 (diff) | |
| download | gitlab-ce-b895c4eff9d0dcf857257025d35f4c24e9269130.tar.gz | |
Merge branch 'fix-rubocop' into 'master'
cherry-picking-regressions-8.17.0
Make RuboCop happy
See merge request !9554
| -rw-r--r-- | spec/support/update_invalid_issuable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/update_invalid_issuable.rb b/spec/support/update_invalid_issuable.rb index f984ac7bfa7..365c34448ac 100644 --- a/spec/support/update_invalid_issuable.rb +++ b/spec/support/update_invalid_issuable.rb @@ -33,7 +33,7 @@ shared_examples 'update invalid issuable' do |klass| end it 'renders json error message when format is json' do - params.merge!(format: "json") + params[:format] = "json" put :update, params |