Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/gitlab/quick_actions/substitution_definition.rb b/lib/gitlab/quick_actions/substitution_definition.rb
index 0fda056a4fe..b7231aa3a8b 100644
--- a/lib/gitlab/quick_actions/substitution_definition.rb
+++ b/lib/gitlab/quick_actions/substitution_definition.rb
@@ -10,14 +10,14 @@ module Gitlab
       end
 
       def match(content)
-        content.match %r{^/#{all_names.join('|')} ?(.*)$}
+        content.match %r{^/#{all_names.join('|')}(?![\S]) ?(.*)$}
       end
 
       def perform_substitution(context, content)
         return unless content
 
         all_names.each do |a_name|
-          content = content.gsub(%r{/#{a_name} ?(.*)$}i, execute_block(action_block, context, '\1'))
+          content = content.gsub(%r{/#{a_name}(?![\S]) ?(.*)$}i, execute_block(action_block, context, '\1'))
         end
 
         content