Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-26

# Conflicts:
#	doc/workflow/time_tracking.md

[ci skip]

doc/workflow/time_tracking.md

@@ -63,11 +63,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)
 
+<<<<<<< HEAD
 Default conversion rates are
 * 1 week = 5 days,
 * 1 day = 8 hours.
@@ -75,6 +77,9 @@ Default conversion rates are
 Other interesting links:
 
 - [Time Tracking landing page on about.gitlab.com][landing]
+=======
+Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h.
+>>>>>>> upstream/master
 
 [landing]: https://about.gitlab.com/features/time-tracking
 [quick actions]: ../user/project/quick_actions.md