Merge branch...

Merge branch '354093-return-appropriate-error-when-merge_request_diff_head_sha-is-not-given' into 'master'

Resolve "Return appropriate error when merge_request_diff_head_sha is not given"

See merge request gitlab-org/gitlab!82278

lib/gitlab/quick_actions/merge_request_actions.rb

@@ -23,7 +23,9 @@ 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 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 +37,8 @@ module Gitlab
             merge_orchestration_service.can_merge?(quick_action_target)
         end
         command :merge do
+          next unless params[:merge_request_diff_head_sha].present?
+
           @updates[:merge] = params[:merge_request_diff_head_sha]
         end
 

locale/gitlab.pot

@@ -23066,6 +23066,9 @@ msgstr ""
 msgid "Merge request dependencies"
 msgstr ""
 
+msgid "Merge request diff sha parameter is required for the merge quick action."
+msgstr ""
+
 msgid "Merge request events"
 msgstr ""
 

spec/services/quick_actions/interpret_service_spec.rb

@@ -799,10 +799,9 @@ RSpec.describe QuickActions::InterpretService do
         let(:project) { repository_project }
         let(:service) { described_class.new(project, developer, {}) }
 
-        it 'precheck passes and returns merge command' do
-          _, updates, _ = service.execute('/merge', merge_request)
-
-          expect(updates).to eq(merge: nil)
+        it_behaves_like 'failed command', 'Merge request diff sha parameter is required for the merge quick action.' do
+          let(:content) { "/merge" }
+          let(:issuable) { merge_request }
         end
       end