Resolve interpret_service.rb and its spec

app/services/slash_commands/interpret_service.rb

@@ -91,36 +91,30 @@ module SlashCommands
     end
 
     desc 'Assign'
-    explanation do |user|
-      "Assigns #{user.to_reference}." if user
+    explanation do |users|
+      "Assigns #{users.map(&:to_reference).to_sentence}." if users.any?
     end
     params '@user'
     condition do
       current_user.can?(:"admin_#{issuable.to_ability_name}", project)
     end
-<<<<<<< HEAD
     parse_params do |assignee_param|
-      extract_references(assignee_param, :user).first ||
-        User.find_by(username: assignee_param)
-    end
-    command :assign do |user|
-      @updates[:assignee_id] = user.id if user
-=======
-    command :assign do |assignee_param|
-      user_ids = extract_references(assignee_param, :user).map(&:id)
+      users = extract_references(assignee_param, :user)
 
-      if user_ids.empty?
-        user_ids = User.where(username: assignee_param.split(' ').map(&:strip)).pluck(:id)
+      if users.empty?
+        users = User.where(username: assignee_param.split(' ').map(&:strip))
       end
 
-      next if user_ids.empty?
+      users
+    end
+    command :assign do |users|
+      next if users.empty?
 
       if issuable.is_a?(Issue)
-        @updates[:assignee_ids] = user_ids
+        @updates[:assignee_ids] = users.map(&:id)
       else
-        @updates[:assignee_id] = user_ids.last
+        @updates[:assignee_id] = users.last.id
       end
->>>>>>> origin/multiple_assignees_review
     end
 
     desc 'Remove assignee'

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
-
-=======
->>>>>>> origin/multiple_assignees_review
     shared_examples 'milestone command' do
       it 'fetches milestone and populates milestone_id if content contains /milestone' do
         milestone # populate the milestone