Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

3 files changed, 6 insertions, 6 deletions

diff --git a/lib/gitlab/quick_actions/issuable_actions.rb b/lib/gitlab/quick_actions/issuable_actions.rb
index 0b37c80dc5f..a12457d89c9 100644
--- a/lib/gitlab/quick_actions/issuable_actions.rb
+++ b/lib/gitlab/quick_actions/issuable_actions.rb
@@ -84,7 +84,7 @@ module Gitlab
           current_user.can?(:"set_#{quick_action_target.to_ability_name}_metadata", quick_action_target) &&
             find_labels.any?
         end
-        command :label do |labels_param|
+        command :label, :labels do |labels_param|
           run_label_command(labels: find_labels(labels_param), command: :label, updates_key: :add_label_ids)
         end
 
diff --git a/lib/gitlab/quick_actions/issue_actions.rb b/lib/gitlab/quick_actions/issue_actions.rb
index e74c58e45b1..14e9e66e037 100644
--- a/lib/gitlab/quick_actions/issue_actions.rb
+++ b/lib/gitlab/quick_actions/issue_actions.rb
@@ -80,7 +80,7 @@ module Gitlab
 
         desc { _('Mark this issue as a duplicate of another issue') }
         explanation do |duplicate_reference|
-          _("Marks this issue as a duplicate of %{duplicate_reference}.") % { duplicate_reference: duplicate_reference }
+          _("Closes this issue. Marks as related to, and a duplicate of, %{duplicate_reference}.") % { duplicate_reference: duplicate_reference }
         end
         params '#issue'
         types Issue
@@ -94,7 +94,7 @@ module Gitlab
           if canonical_issue.present?
             @updates[:canonical_issue_id] = canonical_issue.id
 
-            message = _("Marked this issue as a duplicate of %{duplicate_param}.") % { duplicate_param: duplicate_param }
+            message = _("Closed this issue. Marked as related to, and a duplicate of, %{duplicate_param}.") % { duplicate_param: duplicate_param }
           else
             message = _('Failed to mark this issue as a duplicate because referenced issue was not found.')
           end
diff --git a/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb b/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb
index 8b1ff5d298a..e549ee2e43a 100644
--- a/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb
+++ b/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb
@@ -92,7 +92,7 @@ module Gitlab
         types Issue, MergeRequest
         condition do
           quick_action_target.supports_milestone? &&
-          current_user.can?(:"set_#{quick_action_target.to_ability_name}_metadata", quick_action_target) &&
+            current_user.can?(:"set_#{quick_action_target.to_ability_name}_metadata", quick_action_target) &&
             find_milestones(project, state: 'active').any?
         end
         parse_params do |milestone_param|
@@ -156,7 +156,7 @@ module Gitlab
         types Issue, MergeRequest
         condition do
           quick_action_target.supports_time_tracking? &&
-          current_user.can?(:"admin_#{quick_action_target.to_ability_name}", project)
+            current_user.can?(:"admin_#{quick_action_target.to_ability_name}", project)
         end
         parse_params do |raw_duration|
           Gitlab::TimeTrackingFormatter.parse(raw_duration)
@@ -179,7 +179,7 @@ module Gitlab
         types Issue, MergeRequest
         condition do
           quick_action_target.supports_time_tracking? &&
-          current_user.can?(:"admin_#{quick_action_target.to_ability_name}", quick_action_target)
+            current_user.can?(:"admin_#{quick_action_target.to_ability_name}", quick_action_target)
         end
         parse_params do |raw_time_date|
           Gitlab::QuickActions::SpendTimeAndDateSeparator.new(raw_time_date).execute