summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2016-11-28 13:18:06 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-12-02 20:33:08 +0100
commitc0cd6df7a2d1fc321ac163fb1f33c45476035c9a (patch)
tree8b425bfe0389b2156e97df634534f91c1d4fd56b
parent3ebb815a38ba86e4133557f77b94c292c8fc2e7e (diff)
downloadgitlab-ce-c0cd6df7a2d1fc321ac163fb1f33c45476035c9a.tar.gz
Accept `issue new` as command to create an issuezj-issue-new-over-issue-create
Now only `/trigger issue create` is a valid command, but our UI shows Issue new everywhere. The default now will be `/trigger issue new`. The help message is adjusted to reflect this. Fixes: gitlab-org/gitlab-ce#25025
-rw-r--r--changelogs/unreleased/zj-issue-new-over-issue-create.yml4
-rw-r--r--lib/gitlab/chat_commands/issue_create.rb4
-rw-r--r--spec/lib/gitlab/chat_commands/issue_create_spec.rb7
3 files changed, 13 insertions, 2 deletions
diff --git a/changelogs/unreleased/zj-issue-new-over-issue-create.yml b/changelogs/unreleased/zj-issue-new-over-issue-create.yml
new file mode 100644
index 00000000000..9dd463e4efa
--- /dev/null
+++ b/changelogs/unreleased/zj-issue-new-over-issue-create.yml
@@ -0,0 +1,4 @@
+---
+title: Accept issue new as command to create an issue
+merge_request:
+author:
diff --git a/lib/gitlab/chat_commands/issue_create.rb b/lib/gitlab/chat_commands/issue_create.rb
index 99c1382af44..1dba85c1b51 100644
--- a/lib/gitlab/chat_commands/issue_create.rb
+++ b/lib/gitlab/chat_commands/issue_create.rb
@@ -4,11 +4,11 @@ module Gitlab
def self.match(text)
# we can not match \n with the dot by passing the m modifier as than
# the title and description are not seperated
- /\Aissue\s+create\s+(?<title>[^\n]*)\n*(?<description>(.|\n)*)/.match(text)
+ /\Aissue\s+(new|create)\s+(?<title>[^\n]*)\n*(?<description>(.|\n)*)/.match(text)
end
def self.help_message
- 'issue create <title>\n<description>'
+ 'issue new <title>\n<description>'
end
def self.allowed?(project, user)
diff --git a/spec/lib/gitlab/chat_commands/issue_create_spec.rb b/spec/lib/gitlab/chat_commands/issue_create_spec.rb
index dd07cff9243..6c71e79ff6d 100644
--- a/spec/lib/gitlab/chat_commands/issue_create_spec.rb
+++ b/spec/lib/gitlab/chat_commands/issue_create_spec.rb
@@ -57,5 +57,12 @@ describe Gitlab::ChatCommands::IssueCreate, service: true do
expect(match[:title]).to eq('my title')
expect(match[:description]).to eq('description')
end
+
+ it 'matches the alias new' do
+ match = described_class.match("issue new my title")
+
+ expect(match).not_to be_nil
+ expect(match[:title]).to eq('my title')
+ end
end
end