diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-29 15:08:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-29 15:08:03 +0300 |
| commit | ef59e05bd14aea8bf19bbe77c52116bfe24c7107 (patch) | |
| tree | 6b3f51c7afd746c2cbe3369fcff9a97b392d6cac /lib/gitlab/quick_actions | |
| parent | e878a8e80f55bb09565ca33408f5295b8784e455 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/quick_actions/merge_request_actions.rb b/lib/gitlab/quick_actions/merge_request_actions.rb index e6a73c71e85..1e0f9872152 100644 --- a/lib/gitlab/quick_actions/merge_request_actions.rb +++ b/lib/gitlab/quick_actions/merge_request_actions.rb @@ -24,7 +24,7 @@ module Gitlab end execution_message do if params[:merge_request_diff_head_sha].blank? - _("Merge request diff sha parameter is required for the merge quick action.") + _("The `/merge` quick action requires the SHA of the head of the branch.") 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) |