diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-02 12:10:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-02 12:10:59 +0300 |
| commit | 78bc39880c4b06b2fbe682e0201722a11237a425 (patch) | |
| tree | 00500cb71d9e86a404ec42264cc3b4992e5610ce /spec/controllers/projects/merge_requests_controller_spec.rb | |
| parent | 377b57afa8292caa96921fac7daf6279e12304de (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index fc159e1b70c..f4a5044c049 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -367,7 +367,8 @@ RSpec.describe Projects::MergeRequestsController do namespace_id: project.namespace, project_id: project, id: merge_request.iid, - merge_request: mr_params + merge_request: mr_params, + serializer: 'basic' }.merge(additional_params) put :update, params: params |