Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 4 deletions

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