diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-17 11:48:18 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-17 11:48:18 +0000 |
| commit | 35824650433c319a817428029b096743a18caa6f (patch) | |
| tree | 2c2c21e90f3e06268fabb5fc5400afa0a3f5596f /lib/gitlab | |
| parent | 729a3c076b8f9eea7c41b3cc6c268f122eddb522 (diff) | |
| parent | 5a0027236bd424ec9178d846c94092dfac419ec1 (diff) | |
| download | gitlab-ce-35824650433c319a817428029b096743a18caa6f.tar.gz | |
Merge branch '28329-allow-slash-in-slash-command-args' into 'master'
Allow slashes in slash command arguments
Closes #28329
See merge request !9327
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/slash_commands/extractor.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/slash_commands/extractor.rb b/lib/gitlab/slash_commands/extractor.rb index a672e5e4855..6dbb467d70d 100644 --- a/lib/gitlab/slash_commands/extractor.rb +++ b/lib/gitlab/slash_commands/extractor.rb @@ -103,7 +103,7 @@ module Gitlab (?<cmd>#{Regexp.union(names)}) (?: [ ] - (?<arg>[^\/\n]*) + (?<arg>[^\n]*) )? (?:\n|$) ) |