Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

2 files changed, 8 insertions, 8 deletions

diff --git a/lib/gitlab/quick_actions/extractor.rb b/lib/gitlab/quick_actions/extractor.rb
index dd7a27ead01..1294e475145 100644
--- a/lib/gitlab/quick_actions/extractor.rb
+++ b/lib/gitlab/quick_actions/extractor.rb
@@ -29,9 +29,9 @@ module Gitlab
           # Anything, including `/cmd arg` which are ignored by this filter
           # `
 
-          ^.*`\n*
+          `\n*
           .+?
-          \n*`$
+          \n*`
         )
       }mix.freeze
 
diff --git a/lib/gitlab/quick_actions/merge_request_actions.rb b/lib/gitlab/quick_actions/merge_request_actions.rb
index c8c949a9363..1986b7a1789 100644
--- a/lib/gitlab/quick_actions/merge_request_actions.rb
+++ b/lib/gitlab/quick_actions/merge_request_actions.rb
@@ -56,21 +56,21 @@ module Gitlab
           @updates[:merge] = params[:merge_request_diff_head_sha]
         end
 
-        desc 'Toggle the Work In Progress status'
+        desc 'Toggle the Draft status'
         explanation do
           noun = quick_action_target.to_ability_name.humanize(capitalize: false)
           if quick_action_target.work_in_progress?
-            _("Unmarks this %{noun} as Work In Progress.")
+            _("Unmarks this %{noun} as a draft.")
           else
-            _("Marks this %{noun} as Work In Progress.")
+            _("Marks this %{noun} as a draft.")
           end % { noun: noun }
         end
         execution_message do
           noun = quick_action_target.to_ability_name.humanize(capitalize: false)
           if quick_action_target.work_in_progress?
-            _("Unmarked this %{noun} as Work In Progress.")
+            _("Unmarked this %{noun} as a draft.")
           else
-            _("Marked this %{noun} as Work In Progress.")
+            _("Marked this %{noun} as a draft.")
           end % { noun: noun }
         end
 
@@ -80,7 +80,7 @@ module Gitlab
             # Allow it to mark as WIP on MR creation page _or_ through MR notes.
             (quick_action_target.new_record? || current_user.can?(:"update_#{quick_action_target.to_ability_name}", quick_action_target))
         end
-        command :wip do
+        command :draft, :wip do
           @updates[:wip_event] = quick_action_target.work_in_progress? ? 'unwip' : 'wip'
         end