Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

2 files changed, 13 insertions, 7 deletions

diff --git a/lib/gitlab/quick_actions/merge_request_actions.rb b/lib/gitlab/quick_actions/merge_request_actions.rb
index 6348a4902f8..cc2021e14e3 100644
--- a/lib/gitlab/quick_actions/merge_request_actions.rb
+++ b/lib/gitlab/quick_actions/merge_request_actions.rb
@@ -148,7 +148,7 @@ module Gitlab
           quick_action_target.persisted? && quick_action_target.can_be_approved_by?(current_user)
         end
         command :approve do
-          success = MergeRequests::ApprovalService.new(project: quick_action_target.project, current_user: current_user).execute(quick_action_target)
+          success = ::MergeRequests::ApprovalService.new(project: quick_action_target.project, current_user: current_user).execute(quick_action_target)
 
           next unless success
 
@@ -162,7 +162,7 @@ module Gitlab
           quick_action_target.persisted? && quick_action_target.can_be_unapproved_by?(current_user)
         end
         command :unapprove do
-          success = MergeRequests::RemoveApprovalService.new(project: quick_action_target.project, current_user: current_user).execute(quick_action_target)
+          success = ::MergeRequests::RemoveApprovalService.new(project: quick_action_target.project, current_user: current_user).execute(quick_action_target)
 
           next unless success
 
@@ -275,7 +275,7 @@ module Gitlab
       end
 
       def merge_orchestration_service
-        @merge_orchestration_service ||= MergeRequests::MergeOrchestrationService.new(project, current_user)
+        @merge_orchestration_service ||= ::MergeRequests::MergeOrchestrationService.new(project, current_user)
       end
 
       def preferred_auto_merge_strategy(merge_request)
diff --git a/lib/gitlab/quick_actions/relate_actions.rb b/lib/gitlab/quick_actions/relate_actions.rb
index 95f71214667..1de23523f01 100644
--- a/lib/gitlab/quick_actions/relate_actions.rb
+++ b/lib/gitlab/quick_actions/relate_actions.rb
@@ -17,11 +17,17 @@ module Gitlab
         params '#issue'
         types Issue
         condition do
-          quick_action_target.persisted? &&
-            current_user.can?(:"update_#{quick_action_target.to_ability_name}", quick_action_target)
+          current_user.can?(:"update_#{quick_action_target.to_ability_name}", quick_action_target)
         end
-        command :relate do |related_param|
-          IssueLinks::CreateService.new(quick_action_target, current_user, { issuable_references: [related_param] }).execute
+        command :relate do |related_reference|
+          service = IssueLinks::CreateService.new(quick_action_target, current_user, { issuable_references: [related_reference] })
+          create_issue_link = proc { service.execute }
+
+          if quick_action_target.persisted?
+            create_issue_link.call
+          else
+            quick_action_target.run_after_commit(&create_issue_link)
+          end
         end
       end
     end