Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 8 insertions, 12 deletions

diff --git a/app/services/merge_requests/handle_assignees_change_service.rb b/app/services/merge_requests/handle_assignees_change_service.rb
index 77ff0791eb4..9ac386110f7 100644
--- a/app/services/merge_requests/handle_assignees_change_service.rb
+++ b/app/services/merge_requests/handle_assignees_change_service.rb
@@ -3,17 +3,13 @@
 module MergeRequests
   class HandleAssigneesChangeService < MergeRequests::BaseService
     def async_execute(merge_request, old_assignees, options = {})
-      if Feature.enabled?(:async_handle_merge_request_assignees_change, merge_request.target_project, default_enabled: :yaml)
-        MergeRequests::HandleAssigneesChangeWorker
-          .perform_async(
-            merge_request.id,
-            current_user.id,
-            old_assignees.map(&:id),
-            options
-          )
-      else
-        execute(merge_request, old_assignees, options)
-      end
+      MergeRequests::HandleAssigneesChangeWorker
+        .perform_async(
+          merge_request.id,
+          current_user.id,
+          old_assignees.map(&:id),
+          options
+        )
     end
 
     def execute(merge_request, old_assignees, options = {})
@@ -40,4 +36,4 @@ module MergeRequests
   end
 end
 
-MergeRequests::HandleAssigneesChangeService.prepend_if_ee('EE::MergeRequests::HandleAssigneesChangeService')
+MergeRequests::HandleAssigneesChangeService.prepend_mod_with('MergeRequests::HandleAssigneesChangeService')