summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-01-17 16:10:43 +0000
committerJames Lopez <james@jameslopez.es>2017-01-19 10:40:45 +0100
commit807c56c73cfd2b01a48900daac6338133f19c67f (patch)
tree68d9827a602fc0e31d43b86f5eb36cae331dd9ca /doc
parentbbcc79dad99571031653888372f32fa5b2656706 (diff)
downloadgitlab-ce-807c56c73cfd2b01a48900daac6338133f19c67f.tar.gz
Merge branch '24915_merge_slash_command' into 'master'
Support `/merge` slash command for MRs Closes #24915 See merge request !7746
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/slash_commands.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/user/project/slash_commands.md b/doc/user/project/slash_commands.md
index 5f6a6c6503e..0a66e9a3e15 100644
--- a/doc/user/project/slash_commands.md
+++ b/doc/user/project/slash_commands.md
@@ -14,6 +14,7 @@ do.
|:---------------------------|:-------------|
| `/close` | Close the issue or merge request |
| `/reopen` | Reopen the issue or merge request |
+| `/merge` | Merge (when build succeeds) |
| `/title <New title>` | Change title |
| `/assign @username` | Assign |
| `/unassign` | Remove assignee |