[Multiple issue assignee]: reslving some conflicts

5 files changed, 2 insertions, 47 deletions

diff --git a/lib/api/v3/issues.rb b/lib/api/v3/issues.rb
index cedbeb0ded0..cb371fdbab8 100644
--- a/lib/api/v3/issues.rb
+++ b/lib/api/v3/issues.rb
@@ -61,12 +61,8 @@ module API
         end
         get do
           issues = find_issues(scope: 'authored')
-<<<<<<< HEAD
 
-          present paginate(issues), with: ::API::Entities::Issue, current_user: current_user
-=======
           present paginate(issues), with: ::API::V3::Entities::Issue, current_user: current_user
->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
         end
       end
 
diff --git a/spec/fixtures/api/schemas/issue.json b/spec/fixtures/api/schemas/issue.json
index 983beb838b7..ff86437fdd5 100644
--- a/spec/fixtures/api/schemas/issue.json
+++ b/spec/fixtures/api/schemas/issue.json
@@ -40,13 +40,12 @@
         "additionalProperties": false
       }
     },
-<<<<<<< HEAD
     "assignee": {
       "id": { "type": "integet" },
       "name": { "type": "string" },
       "username": { "type": "string" },
       "avatar_url": { "type": "uri" }
-=======
+    },
     "assignees": {
       "type": "array",
       "items": {
@@ -64,7 +63,6 @@
           "avatar_url": { "type": "uri" }
         }
       }
->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
     },
     "subscribed": { "type": ["boolean", "null"] }
   },
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index f7c317021dc..9b7b5798b71 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -774,24 +774,16 @@ describe API::Issues do
 
     it 'creates a new project issue' do
       post api("/projects/#{project.id}/issues", user),
-<<<<<<< HEAD
-        title: 'new issue', labels: 'label, label2'
-=======
         title: 'new issue', labels: 'label, label2', weight: 3,
         assignee_ids: [user2.id]
->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
 
       expect(response).to have_http_status(201)
       expect(json_response['title']).to eq('new issue')
       expect(json_response['description']).to be_nil
       expect(json_response['labels']).to eq(%w(label label2))
       expect(json_response['confidential']).to be_falsy
-<<<<<<< HEAD
-=======
-      expect(json_response['weight']).to eq(3)
       expect(json_response['assignee']['name']).to eq(user2.name)
       expect(json_response['assignees'].first['name']).to eq(user2.name)
->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
     end
 
     it 'creates a new confidential project issue' do
diff --git a/spec/requests/api/v3/issues_spec.rb b/spec/requests/api/v3/issues_spec.rb
index a1124aebcec..49191b2eb4e 100644
--- a/spec/requests/api/v3/issues_spec.rb
+++ b/spec/requests/api/v3/issues_spec.rb
@@ -737,22 +737,14 @@ describe API::V3::Issues do
   describe "POST /projects/:id/issues" do
     it 'creates a new project issue' do
       post v3_api("/projects/#{project.id}/issues", user),
-<<<<<<< HEAD
-        title: 'new issue', labels: 'label, label2'
-=======
-        title: 'new issue', labels: 'label, label2', weight: 3, assignee_id: assignee.id
->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
+        title: 'new issue', labels: 'label, label2', assignee_id: assignee.id
 
       expect(response).to have_http_status(201)
       expect(json_response['title']).to eq('new issue')
       expect(json_response['description']).to be_nil
       expect(json_response['labels']).to eq(%w(label label2))
       expect(json_response['confidential']).to be_falsy
-<<<<<<< HEAD
-=======
-      expect(json_response['weight']).to eq(3)
       expect(json_response['assignee']['name']).to eq(assignee.name)
->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
     end
 
     it 'creates a new confidential project issue' do
@@ -1149,8 +1141,6 @@ describe API::V3::Issues do
     end
   end
 
-<<<<<<< HEAD
-=======
   describe 'PUT /projects/:id/issues/:issue_id to update assignee' do
     it 'updates an issue with no assignee' do
       put v3_api("/projects/#{project.id}/issues/#{issue.id}", user), assignee_id: 0
@@ -1199,7 +1189,6 @@ describe API::V3::Issues do
     end
   end
 
->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
   describe "DELETE /projects/:id/issues/:issue_id" do
     it "rejects a non member from deleting an issue" do
       delete v3_api("/projects/#{project.id}/issues/#{issue.id}", non_member)
diff --git a/spec/services/slash_commands/interpret_service_spec.rb b/spec/services/slash_commands/interpret_service_spec.rb
index 865a7c69875..9c16421fef0 100644
--- a/spec/services/slash_commands/interpret_service_spec.rb
+++ b/spec/services/slash_commands/interpret_service_spec.rb
@@ -43,26 +43,6 @@ describe SlashCommands::InterpretService, services: true do
       end
     end
 
-<<<<<<< HEAD
-    shared_examples 'assign command' do
-      it 'fetches assignee and populates assignee_id if content contains /assign' do
-        _, updates = service.execute(content, issuable)
-
-        expect(updates).to eq(assignee_id: developer.id)
-      end
-    end
-
-    shared_examples 'unassign command' do
-      it 'populates assignee_id: nil if content contains /unassign' do
-        issuable.update!(assignee_id: developer.id)
-        _, updates = service.execute(content, issuable)
-
-        expect(updates).to eq(assignee_id: nil)
-      end
-    end
-
-=======
->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
     shared_examples 'milestone command' do
       it 'fetches milestone and populates milestone_id if content contains /milestone' do
         milestone # populate the milestone