From 78bc39880c4b06b2fbe682e0201722a11237a425 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 2 Dec 2021 09:10:59 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/controllers/projects/merge_requests_controller_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb') 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 -- cgit v1.2.3