Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 5 insertions, 36 deletions

diff --git a/app/services/merge_requests/approval_service.rb b/app/services/merge_requests/approval_service.rb
index dcc4cf4bb1e..64ae33c9b15 100644
--- a/app/services/merge_requests/approval_service.rb
+++ b/app/services/merge_requests/approval_service.rb
@@ -17,19 +17,11 @@ module MergeRequests
       # utilizing the `Gitlab::EventStore`.
       #
       # Workers can subscribe to the `MergeRequests::ApprovedEvent`.
-      if Feature.enabled?(:async_after_approval, project)
-        Gitlab::EventStore.publish(
-          MergeRequests::ApprovedEvent.new(
-            data: { current_user_id: current_user.id, merge_request_id: merge_request.id }
-          )
+      Gitlab::EventStore.publish(
+        MergeRequests::ApprovedEvent.new(
+          data: { current_user_id: current_user.id, merge_request_id: merge_request.id }
         )
-      else
-        create_event(merge_request)
-        stream_audit_event(merge_request)
-        create_approval_note(merge_request)
-        mark_pending_todos_as_done(merge_request)
-        execute_approval_hooks(merge_request, current_user)
-      end
+      )
 
       success
     end
@@ -37,7 +29,7 @@ module MergeRequests
     private
 
     def can_be_approved?(merge_request)
-      current_user.can?(:approve_merge_request, merge_request)
+      merge_request.can_be_approved_by?(current_user)
     end
 
     def save_approval(approval)
@@ -49,29 +41,6 @@ module MergeRequests
     def reset_approvals_cache(merge_request)
       merge_request.approvals.reset
     end
-
-    def create_event(merge_request)
-      event_service.approve_mr(merge_request, current_user)
-    end
-
-    def stream_audit_event(merge_request)
-      # Defined in EE
-    end
-
-    def create_approval_note(merge_request)
-      SystemNoteService.approve_mr(merge_request, current_user)
-    end
-
-    def mark_pending_todos_as_done(merge_request)
-      todo_service.resolve_todos_for_target(merge_request, current_user)
-    end
-
-    def execute_approval_hooks(merge_request, current_user)
-      # Only one approval is required for a merge request to be approved
-      notification_service.async.approve_mr(merge_request, current_user)
-
-      execute_hooks(merge_request, 'approved')
-    end
   end
 end