Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

2 files changed, 11 insertions, 3 deletions

diff --git a/lib/gitlab/quick_actions/issue_actions.rb b/lib/gitlab/quick_actions/issue_actions.rb
index b44b47eca37..2f89774a257 100644
--- a/lib/gitlab/quick_actions/issue_actions.rb
+++ b/lib/gitlab/quick_actions/issue_actions.rb
@@ -291,7 +291,7 @@ module Gitlab
         types Issue
         condition do
           current_user.can?(:set_issue_crm_contacts, quick_action_target) &&
-            CustomerRelations::Contact.exists_for_group?(quick_action_target.project.group)
+            CustomerRelations::Contact.exists_for_group?(quick_action_target.project.root_ancestor)
         end
         execution_message do
           _('One or more contacts were successfully added.')
@@ -306,7 +306,7 @@ module Gitlab
         types Issue
         condition do
           current_user.can?(:set_issue_crm_contacts, quick_action_target) &&
-            CustomerRelations::Contact.exists_for_group?(quick_action_target.project.group)
+            CustomerRelations::Contact.exists_for_group?(quick_action_target.project.root_ancestor)
         end
         execution_message do
           _('One or more contacts were successfully removed.')
diff --git a/lib/gitlab/quick_actions/merge_request_actions.rb b/lib/gitlab/quick_actions/merge_request_actions.rb
index 842d4ef482b..e6a73c71e85 100644
--- a/lib/gitlab/quick_actions/merge_request_actions.rb
+++ b/lib/gitlab/quick_actions/merge_request_actions.rb
@@ -23,7 +23,11 @@ module Gitlab
           end
         end
         execution_message do
-          if preferred_strategy = preferred_auto_merge_strategy(quick_action_target)
+          if params[:merge_request_diff_head_sha].blank?
+            _("Merge request diff sha parameter is required for the merge quick action.")
+          elsif params[:merge_request_diff_head_sha] != quick_action_target.diff_head_sha
+            _("Branch has been updated since the merge was requested.")
+          elsif preferred_strategy = preferred_auto_merge_strategy(quick_action_target)
             _("Scheduled to merge this merge request (%{strategy}).") % { strategy: preferred_strategy.humanize }
           else
             _('Merged this merge request.')
@@ -35,6 +39,10 @@ module Gitlab
             merge_orchestration_service.can_merge?(quick_action_target)
         end
         command :merge do
+          next unless params[:merge_request_diff_head_sha].present?
+
+          next unless params[:merge_request_diff_head_sha] == quick_action_target.diff_head_sha
+
           @updates[:merge] = params[:merge_request_diff_head_sha]
         end