summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <marcia@gitlab.com>2019-07-31 09:16:25 +0000
committerMarcia Ramos <marcia@gitlab.com>2019-07-31 09:16:25 +0000
commitebfa2b49ac0f5857f7b49305344dda75bbc0d3df (patch)
treee39626dcc2f321ec71adb508ad5b3d0b42749026
parent4b2ea22caf5d5a2f72ce5a590f5264cd45c3eb38 (diff)
parentc8be1e9271b7eeb5a4a07398fb1b73cc86e638d9 (diff)
downloadgitlab-ce-ebfa2b49ac0f5857f7b49305344dda75bbc0d3df.tar.gz
Merge branch 'docs-time-tracking-update' into 'master'
Docs: update time tracking doc See merge request gitlab-org/gitlab-ce!30890
-rw-r--r--doc/workflow/time_tracking.md13
1 files changed, 6 insertions, 7 deletions
diff --git a/doc/workflow/time_tracking.md b/doc/workflow/time_tracking.md
index b55c6b2e3df..fad853f8a44 100644
--- a/doc/workflow/time_tracking.md
+++ b/doc/workflow/time_tracking.md
@@ -22,8 +22,8 @@ below.
## How to enter data
-Time Tracking uses two [quick actions] that GitLab introduced with this new
-feature: `/spend` and `/estimate`.
+Time Tracking uses two [quick actions](../user/project/quick_actions.md)
+that GitLab introduced with this new feature: `/spend` and `/estimate`.
Quick actions can be used in the body of an issue or a merge request, but also
in a comment in both an issue or a merge request.
@@ -73,16 +73,15 @@ The following time units are available:
Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h.
-### Limit displayed units to hours
+### Limit displayed units to hours **(CORE ONLY)**
-> Introduced in GitLab 12.1.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29469/) in GitLab 12.1.
-The display of time units can be limited to hours through the option in **Admin Area > Settings > Preferences** under 'Localization'.
+In GitLab self-managed instances, the display of time units can be limited to
+hours through the option in **Admin Area > Settings > Preferences** under **Localization**.
With this option enabled, `75h` is displayed instead of `1w 4d 3h`.
## Other interesting links
- [Time Tracking landing page on about.gitlab.com](https://about.gitlab.com/solutions/time-tracking/)
-
-[quick actions]: ../user/project/quick_actions.md