diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-01 11:15:51 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-01 11:15:51 +0000 |
| commit | 523fb730c27976900edf040b5ea03e45d29ea965 (patch) | |
| tree | 829b6928f84ea84c84d922bbcbbf3b00072f6876 /doc | |
| parent | 11dd2348c410949c98adfc10cdcf5be787742179 (diff) | |
| parent | 9f949d4e24c5939b5ea4071c3e86c514b4d82970 (diff) | |
| download | gitlab-ce-523fb730c27976900edf040b5ea03e45d29ea965.tar.gz | |
Merge branch '25437-just-emoji' into 'master'
#25437 Allow posting of just an emoji in comment; add /award slash command
Closes #25437
See merge request !9382
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/project/slash_commands.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/user/project/slash_commands.md b/doc/user/project/slash_commands.md index ad5d51d34f2..45176fde9db 100644 --- a/doc/user/project/slash_commands.md +++ b/doc/user/project/slash_commands.md @@ -35,3 +35,4 @@ do. | <code>/spend <1h 30m | -1h 5m></code> | Add or subtract spent time | | `/remove_time_spent` | Remove time spent | | `/target_branch <Branch Name>` | Set target branch for current merge request | +| `/award :emoji:` | Toggle award for :emoji: | |