Add latest changes from gitlab-org/gitlab@master

2 files changed, 42 insertions, 20 deletions

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 5d769d5210a..f9868ccb5b2 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -4097,9 +4097,14 @@ type Group {
     before: String
 
     """
-    List time logs within a time range where the logged date is before end_date parameter.
+    List time logs within a date range where the logged date is equal to or before endDate
     """
-    endDate: Time!
+    endDate: Time
+
+    """
+    List time-logs within a time range where the logged time is equal to or before endTime
+    """
+    endTime: Time
 
     """
     Returns the first _n_ elements from the list.
@@ -4112,9 +4117,14 @@ type Group {
     last: Int
 
     """
-    List time logs within a time range where the logged date is after start_date parameter.
+    List time logs within a date range where the logged date is equal to or after startDate
+    """
+    startDate: Time
+
+    """
+    List time-logs within a time range where the logged time is equal to or after startTime
     """
-    startDate: Time!
+    startTime: Time
   ): TimelogConnection!
 
   """
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index ad66edf36d0..e5bb8d94eeb 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -11530,29 +11530,41 @@
               "args": [
                 {
                   "name": "startDate",
-                  "description": "List time logs within a time range where the logged date is after start_date parameter.",
+                  "description": "List time logs within a date range where the logged date is equal to or after startDate",
                   "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Time",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "Time",
+                    "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
                   "name": "endDate",
-                  "description": "List time logs within a time range where the logged date is before end_date parameter.",
+                  "description": "List time logs within a date range where the logged date is equal to or before endDate",
                   "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Time",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "Time",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "startTime",
+                  "description": "List time-logs within a time range where the logged time is equal to or after startTime",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Time",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "endTime",
+                  "description": "List time-logs within a time range where the logged time is equal to or before endTime",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Time",
+                    "ofType": null
                   },
                   "defaultValue": null
                 },