summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-01-17 16:10:43 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-01-17 16:10:43 +0000
commit25709853cb934a66d9ca363179b39e3dd8e0c13e (patch)
treecb982fa59304aa9346a7f44c335df91413ce2692 /doc
parent16b1512e2271ceec4c9375ecb861b12d0dc82aaa (diff)
parent557a0bf14c79c02c65196ff8f7a2251ecd77073c (diff)
downloadgitlab-ce-25709853cb934a66d9ca363179b39e3dd8e0c13e.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 |