Commit 350bd6dd authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs-run-pipeline-from-cc-fork' into 'master'

Docs: update Time Tracking

See merge request gitlab-org/gitlab!16627
parents 9cccc5fd 83af769f
---
type: reference
---
# Time Tracking # Time Tracking
> Introduced in GitLab 8.14. > Introduced in GitLab 8.14.
...@@ -7,7 +11,7 @@ requests within GitLab. ...@@ -7,7 +11,7 @@ requests within GitLab.
## Overview ## Overview
Time Tracking lets you: Time Tracking allows you:
- Record the time spent working on an issue or a merge request. - Record the time spent working on an issue or a merge request.
- Add an estimate of the amount of time needed to complete an issue or a merge - Add an estimate of the amount of time needed to complete an issue or a merge
...@@ -18,7 +22,7 @@ You don't have to indicate an estimate to enter the time spent, and vice versa. ...@@ -18,7 +22,7 @@ You don't have to indicate an estimate to enter the time spent, and vice versa.
Data about time tracking is shown on the issue/merge request sidebar, as shown Data about time tracking is shown on the issue/merge request sidebar, as shown
below. below.
![Time tracking in the sidebar](time-tracking/time-tracking-sidebar.png) ![Time tracking in the sidebar](time_tracking/img/time_tracking_sidebar_v8_16.png)
## How to enter data ## How to enter data
...@@ -30,7 +34,7 @@ in a comment in both an issue or a merge request. ...@@ -30,7 +34,7 @@ in a comment in both an issue or a merge request.
Below is an example of how you can use those new quick actions inside a comment. Below is an example of how you can use those new quick actions inside a comment.
![Time tracking example in a comment](time-tracking/time-tracking-example.png) ![Time tracking example in a comment](time_tracking/img/time_tracking_example_v12_2.png)
Adding time entries (time spent or estimates) is limited to project members. Adding time entries (time spent or estimates) is limited to project members.
...@@ -65,11 +69,11 @@ To remove all the time spent at once, use `/remove_time_spent`. ...@@ -65,11 +69,11 @@ To remove all the time spent at once, use `/remove_time_spent`.
The following time units are available: The following time units are available:
- months (mo) - Months (mo)
- weeks (w) - Weeks (w)
- days (d) - Days (d)
- hours (h) - Hours (h)
- minutes (m) - Minutes (m)
Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h. Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment