diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-18 22:23:53 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-18 22:23:53 -0600 |
| commit | 0d2ae3e7c15254aa366665cd0323ba9b7845da70 (patch) | |
| tree | 0e970c96ec83bb3df0ba9059bddd4a0ea881c615 /doc/user | |
| parent | c0ba747c586ff7f5f42097a0e49eace30c57ebdf (diff) | |
| parent | 270dc22658424ee7f279db99e56c6fc69acd3eb7 (diff) | |
| download | gitlab-ce-0d2ae3e7c15254aa366665cd0323ba9b7845da70.tar.gz | |
Merge branch 'master' into go-go-gadget-webpack
* master: (67 commits)
Add some API endpoints for time tracking.
use destructuring syntax instead
add changelog yml file
correct User_agent placement in robots.txt
Fixing typo
Fix Project#update_repository_size to convert MB to Bytes properly
Remove repository trait from factories that don't need it in features
Add the `:repository` trait to `:project` factories in Cucumber steps
Add a `:repository` trait to the `:empty_project` factory
Update clipboard_button text: Copy commit SHA to clipboard
Fix search bar filter dropdown scrollbars
get rid of log
fix UI behaviour - only make new calls when button is clicked and dropdown is not displayed
better UI fix - simple solution
Disable all cops in .rubocop_todo.yml
fix spec
refactored a bunch of stuff based on feedback
fix serializer
fix bug retrieving medians
fix specs
...
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/slash_commands.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/user/project/slash_commands.md b/doc/user/project/slash_commands.md index 5f6a6c6503e..a6546cffce2 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 | @@ -29,3 +30,7 @@ do. | <code>/due <in 2 days | this Friday | December 31st></code> | Set due date | | `/remove_due_date` | Remove due date | | `/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 | +| `/remove_time_spent` | Remove time spent | |