summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2018-11-26 04:31:40 +0000
committerEvan Read <eread@gitlab.com>2018-11-26 04:31:40 +0000
commit79ff6da3dd101b199d5a51d3901147e1c0e2312f (patch)
treee7dcdf08f63bac39313067fc8ffc1aa795c5e209 /doc
parentfbbe5ccd1be471a203185c172c51b7137b73f170 (diff)
parent56e6ffca15786b83dbacc3d0546406c13cdea634 (diff)
downloadgitlab-ce-79ff6da3dd101b199d5a51d3901147e1c0e2312f.tar.gz
Merge branch 'patch-32' into 'master'
Add month unit See merge request gitlab-org/gitlab-ce!23297
Diffstat (limited to 'doc')
-rw-r--r--doc/workflow/time_tracking.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/workflow/time_tracking.md b/doc/workflow/time_tracking.md
index bfe87bb2ceb..8a75687e4f5 100644
--- a/doc/workflow/time_tracking.md
+++ b/doc/workflow/time_tracking.md
@@ -62,12 +62,13 @@ To remove all the time spent at once, use `/remove_time_spent`.
## Configuration
The following time units are available:
+* months (mo)
* weeks (w)
* days (d)
* hours (h)
* minutes (m)
-Default conversion rates are 1w = 5d and 1d = 8h.
+Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h.
[landing]: https://about.gitlab.com/features/time-tracking
[quick actions]: ../user/project/quick_actions.md