diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 14:05:44 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 14:05:44 +0100 |
| commit | 2b0e8b86d8aa35ac094d18bfefaa81af916347fa (patch) | |
| tree | a0469ccf9e179832b2231c7f2abfa23956a4048f /lib/gitlab/slash_commands/extractor.rb | |
| parent | 444d71e043eb19979ec1b08504b2760910cb2a47 (diff) | |
| parent | c89449e6110c2bdf6e1410bae3e7b7d807c5e305 (diff) | |
| download | gitlab-ce-2b0e8b86d8aa35ac094d18bfefaa81af916347fa.tar.gz | |
Merge branch 'master' into zj-create-mattermost-team
Diffstat (limited to 'lib/gitlab/slash_commands/extractor.rb')
| -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|$) ) |