diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 09:07:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 09:07:59 +0300 |
| commit | b27cd9649fe4f7aeaffc636e42821c5b71203593 (patch) | |
| tree | 43d476978f14936c42ca2961a1237a2641352c93 /lib/gitlab/quick_actions | |
| parent | c8f81c2efdfd077f3f3146359a1ac4bd6e5359e4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/quick_actions')
| -rw-r--r-- | lib/gitlab/quick_actions/merge_request_actions.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/quick_actions/merge_request_actions.rb b/lib/gitlab/quick_actions/merge_request_actions.rb index f7c0f63b60e..e6a73c71e85 100644 --- a/lib/gitlab/quick_actions/merge_request_actions.rb +++ b/lib/gitlab/quick_actions/merge_request_actions.rb @@ -25,6 +25,8 @@ module Gitlab execution_message do 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 @@ -39,6 +41,8 @@ module Gitlab 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 |