[CE] Support multiple assignees for merge requests

Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).

2 files changed, 3 insertions, 16 deletions

diff --git a/spec/views/projects/merge_requests/edit.html.haml_spec.rb b/spec/views/projects/merge_requests/edit.html.haml_spec.rb
index c13eab30054..529afa03f9c 100644
--- a/spec/views/projects/merge_requests/edit.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/edit.html.haml_spec.rb
@@ -17,7 +17,7 @@ describe 'projects/merge_requests/edit.html.haml' do
       source_project: forked_project,
       target_project: project,
       author: user,
-      assignee: user,
+      assignees: [user],
       milestone: milestone)
   end
 
@@ -40,7 +40,7 @@ describe 'projects/merge_requests/edit.html.haml' do
 
       expect(rendered).to have_field('merge_request[title]')
       expect(rendered).to have_field('merge_request[description]')
-      expect(rendered).to have_selector('#merge_request_assignee_id', visible: false)
+      expect(rendered).to have_selector('input[name="merge_request[label_ids][]"]', visible: false)
       expect(rendered).to have_selector('#merge_request_milestone_id', visible: false)
       expect(rendered).not_to have_selector('#merge_request_target_branch', visible: false)
     end
@@ -52,7 +52,7 @@ describe 'projects/merge_requests/edit.html.haml' do
 
       expect(rendered).to have_field('merge_request[title]')
       expect(rendered).to have_field('merge_request[description]')
-      expect(rendered).to have_selector('#merge_request_assignee_id', visible: false)
+      expect(rendered).to have_selector('input[name="merge_request[label_ids][]"]', visible: false)
       expect(rendered).to have_selector('#merge_request_milestone_id', visible: false)
       expect(rendered).to have_selector('#merge_request_target_branch', visible: false)
     end
diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb
index d9bda1a3414..23cb319a202 100644
--- a/spec/views/projects/merge_requests/show.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb
@@ -53,19 +53,6 @@ describe 'projects/merge_requests/show.html.haml' do
         expect(rendered).not_to have_css('.cannot-be-merged')
       end
     end
-
-    context 'when assignee is not allowed to merge' do
-      it 'shows a warning icon' do
-        reporter = create(:user)
-        project.add_reporter(reporter)
-        closed_merge_request.update(assignee_id: reporter.id)
-        assign(:issuable_sidebar, serialize_issuable_sidebar(user, project, closed_merge_request))
-
-        render
-
-        expect(rendered).to have_css('.cannot-be-merged')
-      end
-    end
   end
 
   context 'when the merge request is closed' do