Commit 35824650 authored by Sean McGivern's avatar Sean McGivern

Merge branch '28329-allow-slash-in-slash-command-args' into 'master'

Allow slashes in slash command arguments

Closes #28329

See merge request !9327
parents 729a3c07 5a002723
---
title: Allow slashes in slash command arguments
merge_request:
author:
...@@ -103,7 +103,7 @@ module Gitlab ...@@ -103,7 +103,7 @@ module Gitlab
(?<cmd>#{Regexp.union(names)}) (?<cmd>#{Regexp.union(names)})
(?: (?:
[ ] [ ]
(?<arg>[^\/\n]*) (?<arg>[^\n]*)
)? )?
(?:\n|$) (?:\n|$)
) )
......
...@@ -81,6 +81,14 @@ describe Gitlab::SlashCommands::Extractor do ...@@ -81,6 +81,14 @@ describe Gitlab::SlashCommands::Extractor do
let(:original_msg) { "/assign @joe\nworld" } let(:original_msg) { "/assign @joe\nworld" }
let(:final_msg) { "world" } let(:final_msg) { "world" }
end end
it 'allows slash in command arguments' do
msg = "/assign @joe / @jane\nworld"
msg, commands = extractor.extract_commands(msg)
expect(commands).to eq [['assign', '@joe / @jane']]
expect(msg).to eq 'world'
end
end end
context 'in the middle of content' do context 'in the middle of content' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment