From c6a33b298229f9e04933be43d6176c476ef03012 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 10 Apr 2020 12:09:36 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 doc/api/graphql/reference/gitlab_schema.graphql |  9 +++++++--
 doc/api/graphql/reference/gitlab_schema.json    | 20 +++++++++++++++++---
 doc/api/graphql/reference/index.md              |  3 ++-
 3 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'doc/api')

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 402415b985c..e79d52d4d10 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -8353,15 +8353,20 @@ scalar Time
 
 type Timelog {
   """
-  The date when the time tracked was spent at
+  Timestamp of when the time tracked was spent at. Deprecated in 12.10: Use `spentAt`
   """
-  date: Time!
+  date: Time! @deprecated(reason: "Use `spentAt`. Deprecated in 12.10")
 
   """
   The issue that logged time was added to
   """
   issue: Issue
 
+  """
+  Timestamp of when the time tracked was spent at
+  """
+  spentAt: Time
+
   """
   The time spent displayed in seconds
   """
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index c214d7c3299..820f41755d0 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -25299,7 +25299,7 @@
           "fields": [
             {
               "name": "date",
-              "description": "The date when the time tracked was spent at",
+              "description": "Timestamp of when the time tracked was spent at. Deprecated in 12.10: Use `spentAt`",
               "args": [
 
               ],
@@ -25312,8 +25312,8 @@
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "Use `spentAt`. Deprecated in 12.10"
             },
             {
               "name": "issue",
@@ -25329,6 +25329,20 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "spentAt",
+              "description": "Timestamp of when the time tracked was spent at",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Time",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "timeSpent",
               "description": "The time spent displayed in seconds",
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index fe5925b95d9..6ed3c5a778e 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -1306,8 +1306,9 @@ Completion status of tasks
 
 | Name  | Type  | Description |
 | ---   |  ---- | ----------  |
-| `date` | Time! | The date when the time tracked was spent at |
+| `date` **{warning-solid}** | Time! | **Deprecated:** Use `spentAt`. Deprecated in 12.10 |
 | `issue` | Issue | The issue that logged time was added to |
+| `spentAt` | Time | Timestamp of when the time tracked was spent at |
 | `timeSpent` | Int! | The time spent displayed in seconds |
 | `user` | User! | The user that logged the time |
 
-- 
cgit v1.2.1