Add latest changes from gitlab-org/gitlab@master

4 files changed, 12 insertions, 8 deletions

diff --git a/doc/workflow/time-tracking/time-tracking-example.png b/doc/workflow/time-tracking/time-tracking-example.png
deleted file mode 100644
index a96e4da7f74..00000000000
--- a/doc/workflow/time-tracking/time-tracking-example.png
+++ /dev/null
diff --git a/doc/workflow/time_tracking.md b/doc/workflow/time_tracking.md
index 3d9f015b1fe..7404d9be210 100644
--- a/doc/workflow/time_tracking.md
+++ b/doc/workflow/time_tracking.md
@@ -1,3 +1,7 @@
+---
+type: reference
+---
+
 # Time Tracking
 
 > Introduced in GitLab 8.14.
@@ -7,7 +11,7 @@ requests within GitLab.
 
 ## Overview
 
-Time Tracking lets you:
+Time Tracking allows you:
 
 - 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
@@ -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
 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
 
@@ -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.
 
-![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.
 
@@ -65,11 +69,11 @@ To remove all the time spent at once, use `/remove_time_spent`.
 
 The following time units are available:
 
-- months (mo)
-- weeks (w)
-- days (d)
-- hours (h)
-- minutes (m)
+- Months (mo)
+- Weeks (w)
+- Days (d)
+- Hours (h)
+- Minutes (m)
 
 Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h.
 
diff --git a/doc/workflow/time_tracking/img/time_tracking_example_v12_2.png b/doc/workflow/time_tracking/img/time_tracking_example_v12_2.png
new file mode 100644
index 00000000000..31d8c490ed1
--- /dev/null
+++ b/doc/workflow/time_tracking/img/time_tracking_example_v12_2.png
diff --git a/doc/workflow/time-tracking/time-tracking-sidebar.png b/doc/workflow/time_tracking/img/time_tracking_sidebar_v8_16.png
index 22124afed6f..22124afed6f 100644
--- a/doc/workflow/time-tracking/time-tracking-sidebar.png
+++ b/doc/workflow/time_tracking/img/time_tracking_sidebar_v8_16.png