[Multiple issue assignees] Resolving conflicts

app/models/issue_assignee.rb

@@ -7,23 +7,7 @@ class IssueAssignee < ActiveRecord::Base
   after_create :update_assignee_cache_counts
   after_destroy :update_assignee_cache_counts
 
-  # EE-specific
-  after_create :update_elasticsearch_index
-  after_destroy :update_elasticsearch_index
-  # EE-specific
-
   def update_assignee_cache_counts
     assignee&.update_cache_counts
   end
-
-  def update_elasticsearch_index
-    if current_application_settings.elasticsearch_indexing?
-      ElasticIndexerWorker.perform_async(
-        :update,
-        'Issue',
-        issue.id,
-        changed_fields: ['assignee_ids']
-      )
-    end
-  end
 end

app/models/user.rb

@@ -89,7 +89,6 @@ class User < ActiveRecord::Base
   has_many :subscriptions,            dependent: :destroy
   has_many :recent_events, -> { order "id DESC" }, foreign_key: :author_id,   class_name: "Event"
   has_many :oauth_applications, class_name: 'Doorkeeper::Application', as: :owner, dependent: :destroy
-
   has_one  :abuse_report,             dependent: :destroy, foreign_key: :user_id
   has_many :reported_abuse_reports,   dependent: :destroy, foreign_key: :reporter_id, class_name: "AbuseReport"
   has_many :spam_logs,                dependent: :destroy

app/services/notification_service.rb

@@ -74,12 +74,14 @@ class NotificationService
       previous_assignee: previous_assignees
     )
 
+    previous_assignee_ids = previous_assignees.map(&:id)
+
     recipients.each do |recipient|
       mailer.send(
         :reassigned_issue_email,
         recipient.id,
         issue.id,
-        previous_assignees.map(&:id),
+        previous_assignee_ids,
         current_user.id
       ).deliver_later
     end