diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-02-05 07:20:05 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-02-05 07:20:05 +0000 |
| commit | 4d11903dcf818342c4bde1af198eac7a45460318 (patch) | |
| tree | a1857cb389d439127f8bfc890ed4a58abd3e4992 | |
| parent | 8a333d45059688bfd5245eb91f206bbbcf7d18eb (diff) | |
| parent | e29b1c6c9e62a363156ce14e0879cf4ff0f7e548 (diff) | |
| download | gitlab-ce-4d11903dcf818342c4bde1af198eac7a45460318.tar.gz | |
Merge branch 'slash-commands-typo' into 'master'
Fixed typo in slash commands docs
Closes #27674
See merge request !8976
| -rw-r--r-- | changelogs/unreleased/slash-commands-typo.yml | 4 | ||||
| -rw-r--r-- | doc/user/project/slash_commands.md | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/slash-commands-typo.yml b/changelogs/unreleased/slash-commands-typo.yml new file mode 100644 index 00000000000..e6ffb94bd08 --- /dev/null +++ b/changelogs/unreleased/slash-commands-typo.yml @@ -0,0 +1,4 @@ +--- +title: Fixed "substract" typo on /help/user/project/slash_commands +merge_request: 8976 +author: Jason Aquino diff --git a/doc/user/project/slash_commands.md b/doc/user/project/slash_commands.md index a53c547e7d2..2fddd7c6503 100644 --- a/doc/user/project/slash_commands.md +++ b/doc/user/project/slash_commands.md @@ -32,6 +32,6 @@ do. | `/wip` | Toggle the Work In Progress status | | <code>/estimate <1w 3d 2h 14m></code> | Set time estimate | | `/remove_estimate` | Remove estimated time | -| <code>/spend <1h 30m | -1h 5m></code> | Add or substract spent time | +| <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 | |