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

Allow slashes in slash command arguments

Closes #28329

See merge request !9327
This commit is contained in:
Sean McGivern 2017-02-17 11:48:18 +00:00
commit 3582465043
3 changed files with 13 additions and 1 deletions

View file

@ -0,0 +1,4 @@
---
title: Allow slashes in slash command arguments
merge_request:
author:

View file

@ -103,7 +103,7 @@ module Gitlab
(?<cmd>#{Regexp.union(names)})
(?:
[ ]
(?<arg>[^\/\n]*)
(?<arg>[^\n]*)
)?
(?:\n|$)
)

View file

@ -81,6 +81,14 @@ describe Gitlab::SlashCommands::Extractor do
let(:original_msg) { "/assign @joe\nworld" }
let(:final_msg) { "world" }
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
context 'in the middle of content' do