diff options
author | Robert Speicher <robert@gitlab.com> | 2017-06-14 23:51:04 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-06-14 23:51:04 +0000 |
commit | 42aaae9916b7b76da968579fcc722067947df018 (patch) | |
tree | f6a8ec6a2cb699b154967cc6b33121dcf930313d | |
parent | 39bbdc4f254746cf6a943b7f44b9a01593c53339 (diff) | |
parent | 41e3b3422607c9f1589988e7672e9a6446cd479e (diff) | |
download | gitlab-ce-42aaae9916b7b76da968579fcc722067947df018.tar.gz |
Merge branch 'dm-target-branch-slash-command-desc' into 'master'
Update /target_branch slash command description to be more consistent
See merge request !12175
-rw-r--r-- | app/services/slash_commands/interpret_service.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/dm-target-branch-slash-command-desc.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/services/slash_commands/interpret_service.rb b/app/services/slash_commands/interpret_service.rb index b6b411d2185..83144b1e011 100644 --- a/app/services/slash_commands/interpret_service.rb +++ b/app/services/slash_commands/interpret_service.rb @@ -410,7 +410,7 @@ module SlashCommands params '@user' command :cc - desc 'Define target branch for MR' + desc 'Set target branch' explanation do |branch_name| "Sets target branch to #{branch_name}." end diff --git a/changelogs/unreleased/dm-target-branch-slash-command-desc.yml b/changelogs/unreleased/dm-target-branch-slash-command-desc.yml new file mode 100644 index 00000000000..768ddf0416e --- /dev/null +++ b/changelogs/unreleased/dm-target-branch-slash-command-desc.yml @@ -0,0 +1,4 @@ +--- +title: Update /target_branch slash command description to be more consistent +merge_request: +author: |