Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

38 files changed, 194 insertions, 118 deletions

diff --git a/spec/fixtures/api/schemas/public_api/v4/board.json b/spec/fixtures/api/schemas/public_api/v4/board.json
index 89a21c29969..c3a140c1bd7 100644
--- a/spec/fixtures/api/schemas/public_api/v4/board.json
+++ b/spec/fixtures/api/schemas/public_api/v4/board.json
@@ -30,6 +30,7 @@
       "properties": {
         "id": { "type": "integer" },
         "avatar_url": { "type": ["string", "null"] },
+        "readme_url":  { "type": ["string", "null"] },
         "description": { "type": ["string", "null"] },
         "default_branch": { "type": ["string", "null"] },
         "tag_list": { "type": "array" },
@@ -42,8 +43,9 @@
         "path_with_namespace": { "type": "string" },
         "star_count": { "type": "integer" },
         "forks_count": { "type": "integer" },
-        "created_at": { "type": "date" },
-        "last_activity_at": { "type": "date" }
+        "created_at": { "type": "string", "format": "date-time" },
+        "namespace": {"type": "object" },
+        "last_activity_at": { "type": "string", "format": "date-time" }
       },
       "additionalProperties": false
     },
@@ -70,7 +72,7 @@
               "id": { "type": "integer" },
               "color": {
                 "type": "string",
-                "pattern": "^#[0-9A-Fa-f]{3}{1,2}+$"
+                "pattern": "#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})"
               },
               "description": { "type": ["string", "null"] },
               "name": { "type": "string" }
diff --git a/spec/fixtures/api/schemas/public_api/v4/commit/basic.json b/spec/fixtures/api/schemas/public_api/v4/commit/basic.json
index da99e99c692..227b5a20af3 100644
--- a/spec/fixtures/api/schemas/public_api/v4/commit/basic.json
+++ b/spec/fixtures/api/schemas/public_api/v4/commit/basic.json
@@ -19,7 +19,7 @@
     "id": { "type": ["string", "null"] },
     "short_id": { "type": ["string", "null"] },
     "title": { "type": "string" },
-    "created_at": { "type": "date" },
+    "created_at": { "type": "string", "format": "date-time" },
     "parent_ids": {
       "type": ["array", "null"],
       "items": {
@@ -30,10 +30,10 @@
     "message": { "type": "string" },
     "author_name": { "type": "string" },
     "author_email": { "type": "string" },
-    "authored_date": { "type": "date" },
+    "authored_date": { "type": "string", "format": "date-time" },
     "committer_name": { "type": "string" },
     "committer_email": { "type": "string" },
-    "committed_date": { "type": "date" },
+    "committed_date": { "type": "string", "format": "date-time" },
     "web_url": { "type": "string" }
   }
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/commit_note.json b/spec/fixtures/api/schemas/public_api/v4/commit_note.json
index 02081989271..305febea75c 100644
--- a/spec/fixtures/api/schemas/public_api/v4/commit_note.json
+++ b/spec/fixtures/api/schemas/public_api/v4/commit_note.json
@@ -14,6 +14,6 @@
     "line": { "type": ["integer", "null"] },
     "line_type": { "type": ["string", "null"] },
     "author": { "$ref": "user/basic.json" },
-    "created_at": { "type": "date" }
+    "created_at": { "type": "string", "format": "date-time" }
   }
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/deploy_token.json b/spec/fixtures/api/schemas/public_api/v4/deploy_token.json
index 7cb9f136b0d..c4d3f944aea 100644
--- a/spec/fixtures/api/schemas/public_api/v4/deploy_token.json
+++ b/spec/fixtures/api/schemas/public_api/v4/deploy_token.json
@@ -17,9 +17,7 @@
     "username": {
       "type": "string"
     },
-    "expires_at": {
-      "type": "date"
-    },
+    "expires_at": { "type": "string" },
     "scopes": {
       "type": "array",
       "items": {
diff --git a/spec/fixtures/api/schemas/public_api/v4/environment.json b/spec/fixtures/api/schemas/public_api/v4/environment.json
index 57352017f03..b90bfe8de55 100644
--- a/spec/fixtures/api/schemas/public_api/v4/environment.json
+++ b/spec/fixtures/api/schemas/public_api/v4/environment.json
@@ -18,7 +18,10 @@
         { "$ref": "deployment.json" }
       ]
     },
-    "state": { "type": "string" }
+    "state": { "type": "string" },
+    "enable_advanced_logs_querying": { "type": "boolean" },
+    "logs_api_path": { "type": "string" },
+    "gitlab_managed_apps_logs_path": { "type": "string" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/feature_flag.json b/spec/fixtures/api/schemas/public_api/v4/feature_flag.json
index 0f304e9ee73..1de19419a30 100644
--- a/spec/fixtures/api/schemas/public_api/v4/feature_flag.json
+++ b/spec/fixtures/api/schemas/public_api/v4/feature_flag.json
@@ -6,8 +6,8 @@
     "description": { "type": ["string", "null"] },
     "active": {"type": "boolean" },
     "version": { "type": "string" },
-    "created_at": { "type": "date" },
-    "updated_at": { "type": "date" },
+    "created_at": { "type": "string", "format": "date-time" },
+    "updated_at": { "type": "string", "format": "date-time" },
     "scopes": { "type": "array", "items": { "$ref": "feature_flag_scope.json" } },
     "strategies": { "type": "array", "items": { "$ref": "operations/strategy.json" } }
   },
diff --git a/spec/fixtures/api/schemas/public_api/v4/feature_flag_detailed_scopes.json b/spec/fixtures/api/schemas/public_api/v4/feature_flag_detailed_scopes.json
index a11ae5705cc..64237ee1a6d 100644
--- a/spec/fixtures/api/schemas/public_api/v4/feature_flag_detailed_scopes.json
+++ b/spec/fixtures/api/schemas/public_api/v4/feature_flag_detailed_scopes.json
@@ -13,8 +13,8 @@
       "id": { "type": "integer" },
       "environment_scope": { "type": "string" },
       "active": { "type": "boolean" },
-      "created_at": { "type": "date" },
-      "updated_at": { "type": "date" },
+      "created_at": { "type": "string", "format": "date-time" },
+      "updated_at": { "type": "string", "format": "date-time" },
       "strategies": { "type": "array", "items": { "$ref": "feature_flag_strategy.json" } }
     },
     "additionalProperties": false
diff --git a/spec/fixtures/api/schemas/public_api/v4/feature_flag_scope.json b/spec/fixtures/api/schemas/public_api/v4/feature_flag_scope.json
index 18402af482e..c8e77e2418c 100644
--- a/spec/fixtures/api/schemas/public_api/v4/feature_flag_scope.json
+++ b/spec/fixtures/api/schemas/public_api/v4/feature_flag_scope.json
@@ -9,8 +9,8 @@
     "id": { "type": "integer" },
     "environment_scope": { "type": "string" },
     "active": { "type": "boolean" },
-    "created_at": { "type": "date" },
-    "updated_at": { "type": "date" },
+    "created_at": { "type": "string", "format": "date-time" },
+    "updated_at": { "type": "string", "format": "date-time" },
     "strategies": { "type": "array", "items": { "$ref": "feature_flag_strategy.json" } }
   },
   "additionalProperties": false
diff --git a/spec/fixtures/api/schemas/public_api/v4/issue.json b/spec/fixtures/api/schemas/public_api/v4/issue.json
index 69ecba8b6f3..3173a8ebfb5 100644
--- a/spec/fixtures/api/schemas/public_api/v4/issue.json
+++ b/spec/fixtures/api/schemas/public_api/v4/issue.json
@@ -8,9 +8,9 @@
     "description": { "type": ["string", "null"] },
     "state": { "type": "string" },
     "discussion_locked": { "type": ["boolean", "null"] },
-    "closed_at": { "type": "date" },
-    "created_at": { "type": "date" },
-    "updated_at": { "type": "date" },
+    "closed_at": { "type": ["string", "null"] },
+    "created_at": { "type": "string", "format": "date-time" },
+    "updated_at": { "type": "string", "format": "date-time" },
     "labels": {
       "type": "array",
       "items": {
@@ -27,10 +27,10 @@
         "title": { "type": "string" },
         "description": { "type": ["string", "null"] },
         "state": { "type": "string" },
-        "created_at": { "type": "date" },
-        "updated_at": { "type": "date" },
-        "due_date": { "type": "date" },
-        "start_date": { "type": "date" }
+        "created_at": { "type": "string", "format": "date-time" },
+        "updated_at": { "type": "string", "format": "date-time" },
+        "due_date": { "type": "string"  , "format": "date-time" },
+        "start_date": { "type": "string", "format": "date-time" }
       },
       "additionalProperties": false
     },
@@ -83,7 +83,7 @@
     "user_notes_count": { "type": "integer" },
     "upvotes": { "type": "integer" },
     "downvotes": { "type": "integer" },
-    "due_date": { "type": ["date", "null"] },
+    "due_date": { "type": ["string", "null"] },
     "confidential": { "type": "boolean" },
     "web_url": { "type": "uri" },
     "time_stats": {
diff --git a/spec/fixtures/api/schemas/public_api/v4/issue_link.json b/spec/fixtures/api/schemas/public_api/v4/issue_link.json
index 588d63c2dcf..33184be07c3 100644
--- a/spec/fixtures/api/schemas/public_api/v4/issue_link.json
+++ b/spec/fixtures/api/schemas/public_api/v4/issue_link.json
@@ -15,8 +15,8 @@
        "type": "string",
        "enum": ["relates_to", "blocks", "is_blocked_by"]
      },
-     "link_created_at": { "type": "date" },
-     "link_updated_at": { "type": "date" }
+     "link_created_at": { "type": "string" },
+     "link_updated_at": { "type": "string" }
   },
   "required" : [ "source_issue", "target_issue", "link_type" ]
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/job.json b/spec/fixtures/api/schemas/public_api/v4/job.json
index b50479841a9..afed4f23017 100644
--- a/spec/fixtures/api/schemas/public_api/v4/job.json
+++ b/spec/fixtures/api/schemas/public_api/v4/job.json
@@ -12,6 +12,7 @@
     "started_at",
     "finished_at",
     "duration",
+    "queued_duration",
     "user",
     "commit",
     "pipeline",
@@ -34,6 +35,7 @@
     "started_at": { "type": ["null", "string"] },
     "finished_at": { "type": ["null", "string"] },
     "duration": { "type": ["null", "number"] },
+    "queued_duration": { "type": ["null", "number"] },
     "user": { "$ref": "user/basic.json" },
     "commit": {
       "oneOf": [
diff --git a/spec/fixtures/api/schemas/public_api/v4/label_basic.json b/spec/fixtures/api/schemas/public_api/v4/label_basic.json
index a501bc2ec56..a4653c67ed2 100644
--- a/spec/fixtures/api/schemas/public_api/v4/label_basic.json
+++ b/spec/fixtures/api/schemas/public_api/v4/label_basic.json
@@ -6,7 +6,8 @@
     "color",
     "description",
     "description_html",
-    "text_color"
+    "text_color",
+    "remove_on_close"
   ],
   "properties": {
     "id": { "type": "integer" },
@@ -20,7 +21,8 @@
     "text_color": {
       "type": "string",
       "pattern": "^#[0-9A-Fa-f]{3}{1,2}$"
-    }
+    },
+    "remove_on_close": { "type": "boolean" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/members.json b/spec/fixtures/api/schemas/public_api/v4/members.json
index 695f00b0040..adfc3c519ca 100644
--- a/spec/fixtures/api/schemas/public_api/v4/members.json
+++ b/spec/fixtures/api/schemas/public_api/v4/members.json
@@ -10,7 +10,7 @@
       "avatar_url": { "type": ["string", "null"] },
       "web_url": { "type": ["string", "null"] },
       "access_level": { "type": "integer" },
-      "expires_at": { "type": ["date", "null"] },
+      "expires_at": { "type": ["string", "null"], "format": "date-time" },
       "is_using_seat": { "type": "boolean" }
     },
     "required": [
diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_request.json b/spec/fixtures/api/schemas/public_api/v4/merge_request.json
index 3bf1299a1d8..c31e91cfef8 100644
--- a/spec/fixtures/api/schemas/public_api/v4/merge_request.json
+++ b/spec/fixtures/api/schemas/public_api/v4/merge_request.json
@@ -20,7 +20,7 @@
         },
         "additionalProperties": false
       },
-      "merged_at": { "type": ["date", "null"] },
+      "merged_at": { "type": ["string", "null"] },
       "closed_by": {
         "type": ["object", "null"],
         "properties": {
@@ -33,9 +33,9 @@
         },
         "additionalProperties": false
       },
-      "closed_at": { "type": ["date", "null"] },
-      "created_at": { "type": "date" },
-      "updated_at": { "type": "date" },
+      "closed_at": { "type": ["string", "null"], "format": "date-time" },
+      "created_at": { "type": "string", "format": "date-time" },
+      "updated_at": { "type": "string", "format": "date-time" },
       "target_branch": { "type": "string" },
       "source_branch": { "type": "string" },
       "upvotes": { "type": "integer" },
@@ -88,10 +88,10 @@
           "title": { "type": "string" },
           "description": { "type": ["string", "null"] },
           "state": { "type": "string" },
-          "created_at": { "type": "date" },
-          "updated_at": { "type": "date" },
-          "due_date": { "type": "date" },
-          "start_date": { "type": "date" }
+          "created_at": { "type": "string", "format": "date-time" },
+          "updated_at": { "type": "string", "format": "date-time" },
+          "due_date": { "type": "string", "format": "date-time" },
+          "start_date": { "type": "string", "format": "date-time" }
         },
         "additionalProperties": false
       },
diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_request_simple.json b/spec/fixtures/api/schemas/public_api/v4/merge_request_simple.json
index 45507e3e400..f176e5ee261 100644
--- a/spec/fixtures/api/schemas/public_api/v4/merge_request_simple.json
+++ b/spec/fixtures/api/schemas/public_api/v4/merge_request_simple.json
@@ -8,8 +8,8 @@
       "title": { "type": "string" },
       "description": { "type": ["string", "null"] },
       "state": { "type": "string" },
-      "created_at": { "type": "date" },
-      "updated_at": { "type": "date" },
+      "created_at": { "type": "string", "format": "date-time" },
+      "updated_at": { "type": "string", "format": "date-time" },
       "web_url": { "type": "uri" }
     },
     "required": [
diff --git a/spec/fixtures/api/schemas/public_api/v4/milestone.json b/spec/fixtures/api/schemas/public_api/v4/milestone.json
index c8c6a7b6ae1..e7e0e57f02f 100644
--- a/spec/fixtures/api/schemas/public_api/v4/milestone.json
+++ b/spec/fixtures/api/schemas/public_api/v4/milestone.json
@@ -8,10 +8,10 @@
     "title": { "type": "string" },
     "description": { "type": ["string", "null"] },
     "state": { "type": "string" },
-    "created_at": { "type": "date" },
-    "updated_at": { "type": "date" },
-    "start_date": { "type": "date" },
-    "due_date": { "type": "date" },
+    "created_at": { "type": "string" },
+    "updated_at": { "type": "string" },
+    "start_date": { "type": ["string", "null"], "format": "date-time" },
+    "due_date": { "type": ["string", "null"], "format": "date-time" },
     "expired": { "type": ["boolean", "null"] },
     "web_url": { "type": "string" }
   },
diff --git a/spec/fixtures/api/schemas/public_api/v4/milestone_with_stats.json b/spec/fixtures/api/schemas/public_api/v4/milestone_with_stats.json
index f008ed7d55f..d09d1634eb9 100644
--- a/spec/fixtures/api/schemas/public_api/v4/milestone_with_stats.json
+++ b/spec/fixtures/api/schemas/public_api/v4/milestone_with_stats.json
@@ -8,10 +8,10 @@
     "title": { "type": "string" },
     "description": { "type": ["string", "null"] },
     "state": { "type": "string" },
-    "created_at": { "type": "date" },
-    "updated_at": { "type": "date" },
-    "start_date": { "type": "date" },
-    "due_date": { "type": "date" },
+    "created_at": { "type": "string", "format": "date-time" },
+    "updated_at": { "type": "string", "format": "date-time" },
+    "start_date": { "type": ["string", "null"], "format": "date-time" },
+    "due_date": { "type": ["string", "null"], "format": "date-time" },
     "expired": { "type": ["boolean", "null"] },
     "web_url": { "type": "string" },
     "issue_stats": {
diff --git a/spec/fixtures/api/schemas/public_api/v4/notes.json b/spec/fixtures/api/schemas/public_api/v4/notes.json
index c4510207882..25e8f9cbed6 100644
--- a/spec/fixtures/api/schemas/public_api/v4/notes.json
+++ b/spec/fixtures/api/schemas/public_api/v4/notes.json
@@ -22,8 +22,8 @@
         ]
       },
       "commands_changes": { "type": "object", "additionalProperties": true },
-      "created_at": { "type": "date" },
-      "updated_at": { "type": "date" },
+      "created_at": { "type": "string", "format": "date-time" },
+      "updated_at": { "type": "string", "format": "date-time" },
       "system": { "type": "boolean" },
       "noteable_id": { "type": "integer" },
       "noteable_iid": { "type": "integer" },
@@ -31,7 +31,7 @@
       "resolved": { "type": "boolean" },
       "resolvable": { "type": "boolean" },
       "resolved_by": { "type": ["string", "null"] },
-      "resolved_at": { "type": ["date", "null"] },
+      "resolved_at": { "type": ["string", "null"] },
       "confidential": { "type": ["boolean", "null"] }
     },
     "required": [
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json
index 724df5a437d..0fa59bc3bec 100644
--- a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json
@@ -2,7 +2,6 @@
   "type": "object",
   "required": ["count", "items"],
   "properties": {
-    "count": { "const": 0 },
     "items": {
       "type": "array",
       "items": {
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/package.json b/spec/fixtures/api/schemas/public_api/v4/packages/package.json
index 08909efd10c..607e0df1886 100644
--- a/spec/fixtures/api/schemas/public_api/v4/packages/package.json
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/package.json
@@ -4,6 +4,7 @@
     "name",
     "version",
     "package_type",
+    "status",
     "_links",
     "versions"
   ],
@@ -20,6 +21,9 @@
     "package_type": {
       "type": "string"
     },
+    "status": {
+      "type": "string"
+    },
     "_links": {
       "type": "object",
       "required": [
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json b/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json
index 93b6dcde080..332e42fdbe5 100644
--- a/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json
@@ -8,6 +8,8 @@
       "package_id": { "type": "integer" },
       "file_name": { "type": "string" },
       "file_sha1": { "type": "string" },
+      "file_sha256": { "type": "string" },
+      "file_md5": { "type": "string" },
       "pipelines": {
         "items": { "$ref": "../pipeline.json" }
       }
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/module.json b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/module.json
new file mode 100644
index 00000000000..f0e2c8e1765
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/module.json
@@ -0,0 +1,12 @@
+{
+  "type": "object",
+  "required" : ["versions"],
+  "optional" : ["source"],
+  "properties" : {
+    "source": { "type": "string" },
+    "versions": {
+      "minItems": 0,
+      "items": { "$ref": "./version.json" }
+    }
+  }
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/modules.json b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/modules.json
new file mode 100644
index 00000000000..f31a41b17de
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/modules.json
@@ -0,0 +1,4 @@
+{
+  "type": "array",
+  "items": { "$ref": "./module.json" }
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/version.json b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/version.json
new file mode 100644
index 00000000000..4fd5595c423
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/version.json
@@ -0,0 +1,38 @@
+{
+  "type": "object",
+  "required": ["version", "submodules", "root"],
+  "properties": {
+    "version": {
+      "type": "string"
+    },
+    "submodules": {
+      "type": "array",
+      "maxItems": 0
+    },
+    "root": {
+      "type": "object",
+      "required": ["dependencies", "providers"],
+      "properties": {
+        "dependencies": {
+          "type": "array",
+          "maxItems": 0
+        },
+        "providers": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": ["name", "version"],
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "version": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/versions.json b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/versions.json
new file mode 100644
index 00000000000..647e9d11d8b
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/versions.json
@@ -0,0 +1,9 @@
+{
+  "type": "object",
+  "required" : ["modules"],
+  "properties" : {
+    "modules": {
+      "items": { "$ref": "./module.json" }
+    }
+  }
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json b/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json
index 721b8d4641f..66d4be529b1 100644
--- a/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json
+++ b/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json
@@ -6,7 +6,7 @@
     "project_id": { "type": "integer" },
     "verified": { "type": "boolean" },
     "verification_code": { "type": ["string", "null"] },
-    "enabled_until": { "type": ["date", "null"] },
+    "enabled_until": { "type": ["string", "null"], "format": "date-time" },
     "auto_ssl_enabled": { "type": "boolean" },
     "certificate_expiration": {
       "type": "object",
diff --git a/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json b/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json
index 3dd80a6f11b..bbbc610eb27 100644
--- a/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json
+++ b/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json
@@ -5,7 +5,7 @@
     "url": { "type": "uri" },
     "verified": { "type": "boolean" },
     "verification_code": { "type": ["string", "null"] },
-    "enabled_until": { "type": ["date", "null"] },
+    "enabled_until": { "type": ["string", "null"] },
     "auto_ssl_enabled": { "type": "boolean" },
     "certificate": {
       "type": "object",
diff --git a/spec/fixtures/api/schemas/public_api/v4/pipeline/detail.json b/spec/fixtures/api/schemas/public_api/v4/pipeline/detail.json
index 63e130d4055..d3cabdde45c 100644
--- a/spec/fixtures/api/schemas/public_api/v4/pipeline/detail.json
+++ b/spec/fixtures/api/schemas/public_api/v4/pipeline/detail.json
@@ -13,11 +13,11 @@
             { "$ref": "../user/basic.json" }
           ]
         },
-        "created_at": { "type": ["date", "null"] },
-        "updated_at": { "type": ["date", "null"] },
-        "started_at": { "type": ["date", "null"] },
-        "finished_at": { "type": ["date", "null"] },
-        "committed_at": { "type": ["date", "null"] },
+        "created_at": { "type": ["string", "null"], "format": "date-time" },
+        "updated_at": { "type": ["string", "null"], "format": "date-time" },
+        "started_at": { "type": ["string", "null"], "format": "date-time" },
+        "finished_at": { "type": ["string", "null"], "format": "date-time" },
+        "committed_at": { "type": ["string", "null"], "format": "date-time"  },
         "duration": { "type": ["number", "null"] },
         "coverage": { "type": ["string", "null"] },
         "detailed_status": {
diff --git a/spec/fixtures/api/schemas/public_api/v4/project.json b/spec/fixtures/api/schemas/public_api/v4/project.json
new file mode 100644
index 00000000000..4a3149f2bdc
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/project.json
@@ -0,0 +1,45 @@
+{
+  "type": "object",
+  "properties" : {
+    "id": { "type": "integer" },
+    "name": { "type": "string" },
+    "name_with_namespace": { "type": "string" },
+    "description": { "type": ["string", "null"] },
+    "path": { "type": "string" },
+    "path_with_namespace": { "type": "string" },
+    "created_at": { "type": "string", "format": "date-time" },
+    "default_branch": { "type": ["string", "null"] },
+    "tag_list": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "ssh_url_to_repo": { "type": "string" },
+    "http_url_to_repo": { "type": "string" },
+    "web_url": { "type": "string" },
+    "readme_url": { "type": ["string", "null"] },
+    "avatar_url": { "type": ["string", "null"] },
+    "star_count": { "type": "integer" },
+    "forks_count": { "type": "integer" },
+    "last_activity_at": { "type": "string", "format": "date-time" },
+    "namespace": {
+      "type": "object",
+      "properties" : {
+        "id": { "type": "integer" },
+        "name": { "type": "string" },
+        "path": { "type": "string" },
+        "kind": { "type": "string" },
+        "full_path": { "type": "string" },
+        "parent_id": { "type": ["integer", "null"] }
+      }
+    }
+  },
+  "required": [
+    "id", "name", "name_with_namespace", "description", "path",
+    "path_with_namespace", "created_at", "default_branch", "tag_list",
+    "ssh_url_to_repo", "http_url_to_repo", "web_url", "readme_url", "avatar_url",
+    "star_count", "forks_count", "last_activity_at", "namespace"
+  ],
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/project/identity.json b/spec/fixtures/api/schemas/public_api/v4/project/identity.json
index e35ab023d44..138c0142d02 100644
--- a/spec/fixtures/api/schemas/public_api/v4/project/identity.json
+++ b/spec/fixtures/api/schemas/public_api/v4/project/identity.json
@@ -16,6 +16,6 @@
     "name_with_namespace": { "type": "string" },
     "path": { "type": "string" },
     "path_with_namespace": { "type": "string" },
-    "created_at": { "type": "date" }
+    "created_at": { "type": "string", "format": "date-time" }
   }
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json b/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json
index 6f8a2ff58e5..cfaa1c28bb7 100644
--- a/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json
+++ b/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json
@@ -10,7 +10,7 @@
   ],
   "properties" : {
     "id": { "type": "integer" },
-    "created_at": { "type": "date" },
+    "created_at": { "type": "string", "format": "date-time" },
     "state": { "type": "string" },
     "source_storage_name": { "type": "string" },
     "destination_storage_name": { "type": "string" },
diff --git a/spec/fixtures/api/schemas/public_api/v4/projects.json b/spec/fixtures/api/schemas/public_api/v4/projects.json
index af5670ebd33..20f26a7f805 100644
--- a/spec/fixtures/api/schemas/public_api/v4/projects.json
+++ b/spec/fixtures/api/schemas/public_api/v4/projects.json
@@ -1,48 +1,4 @@
 {
   "type": "array",
-  "items": {
-    "type": "object",
-    "properties" : {
-      "id": { "type": "integer" },
-      "name": { "type": "string" },
-      "name_with_namespace": { "type": "string" },
-      "description": { "type": ["string", "null"] },
-      "path": { "type": "string" },
-      "path_with_namespace": { "type": "string" },
-      "created_at": { "type": "date" },
-      "default_branch": { "type": ["string", "null"] },
-      "tag_list": {
-        "type": "array",
-        "items": {
-          "type": "string"
-        }
-      },
-      "ssh_url_to_repo": { "type": "string" },
-      "http_url_to_repo": { "type": "string" },
-      "web_url": { "type": "string" },
-      "readme_url": { "type": ["string", "null"] },
-      "avatar_url": { "type": ["string", "null"] },
-      "star_count": { "type": "integer" },
-      "forks_count": { "type": "integer" },
-      "last_activity_at": { "type": "date" },
-      "namespace": {
-        "type": "object",
-        "properties" : {
-          "id": { "type": "integer" },
-          "name": { "type": "string" },
-          "path": { "type": "string" },
-          "kind": { "type": "string" },
-          "full_path": { "type": "string" },
-          "parent_id": { "type": ["integer", "null"] }
-        }
-      }
-    },
-    "required": [
-      "id", "name", "name_with_namespace", "description", "path",
-      "path_with_namespace", "created_at", "default_branch", "tag_list",
-      "ssh_url_to_repo", "http_url_to_repo", "web_url", "avatar_url",
-      "star_count", "last_activity_at", "namespace"
-    ],
-    "additionalProperties": false
-  }
+  "items": { "$ref": "project.json" }
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/release.json b/spec/fixtures/api/schemas/public_api/v4/release.json
index 69ac383b7fd..463924147be 100644
--- a/spec/fixtures/api/schemas/public_api/v4/release.json
+++ b/spec/fixtures/api/schemas/public_api/v4/release.json
@@ -6,8 +6,8 @@
     "tag_name": { "type": "string" },
     "description": { "type": "string" },
     "description_html": { "type": "string" },
-    "created_at": { "type": "date" },
-    "released_at": { "type": "date" },
+    "created_at": { "type": "string" , "format": "date-time"},
+    "released_at": { "type": "string", "format": "date-time" },
     "upcoming_release": { "type": "boolean" },
     "commit": {
       "oneOf": [{ "type": "null" }, { "$ref": "commit/basic.json" }]
diff --git a/spec/fixtures/api/schemas/public_api/v4/release/evidence.json b/spec/fixtures/api/schemas/public_api/v4/release/evidence.json
index fbebac0acaa..2f3dfc40aec 100644
--- a/spec/fixtures/api/schemas/public_api/v4/release/evidence.json
+++ b/spec/fixtures/api/schemas/public_api/v4/release/evidence.json
@@ -8,7 +8,7 @@
   "properties" : {
     "sha": { "type": "string" },
     "filepath": { "type": "string" },
-    "collected_at": { "type": "date" }
+    "collected_at": { "type": "string", "format": "date-time" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json b/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json
index 058b7b4b4ed..465e1193a64 100644
--- a/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json
+++ b/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json
@@ -5,8 +5,8 @@
     "name": { "type": "string" },
     "description": { "type": "string" },
     "description_html": { "type": "string" },
-    "created_at": { "type": "date" },
-    "released_at": { "type": "date" },
+    "created_at":  { "type": "string", "format": "date-time" },
+    "released_at": { "type": "string", "format": "date-time" },
     "upcoming_release": { "type": "boolean" },
     "milestones": {
       "type": "array",
diff --git a/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json
index f51e7e8edc5..b0633a6ff2d 100644
--- a/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json
+++ b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json
@@ -10,7 +10,7 @@
   ],
   "properties" : {
     "id": { "type": "integer" },
-    "created_at": { "type": "date" },
+    "created_at": { "type": "string", "format": "date-time" },
     "state": { "type": "string" },
     "source_storage_name": { "type": "string" },
     "destination_storage_name": { "type": "string" },
diff --git a/spec/fixtures/api/schemas/public_api/v4/snippets.json b/spec/fixtures/api/schemas/public_api/v4/snippets.json
index de658e01657..65299901128 100644
--- a/spec/fixtures/api/schemas/public_api/v4/snippets.json
+++ b/spec/fixtures/api/schemas/public_api/v4/snippets.json
@@ -21,8 +21,8 @@
       "visibility": { "type": "string" },
       "web_url": { "type": "string" },
       "raw_url": { "type": "string" },
-      "created_at": { "type": "date" },
-      "updated_at": { "type": "date" },
+      "created_at": { "type": "string", "format": "date-time" },
+      "updated_at": { "type": "string", "format": "date-time" },
       "author": {
         "type": "object",
         "properties": {
diff --git a/spec/fixtures/api/schemas/public_api/v4/user/public.json b/spec/fixtures/api/schemas/public_api/v4/user/public.json
index ee848eda9ed..0955c70aef0 100644
--- a/spec/fixtures/api/schemas/public_api/v4/user/public.json
+++ b/spec/fixtures/api/schemas/public_api/v4/user/public.json
@@ -41,7 +41,7 @@
     },
     "avatar_url": { "type": "string" },
     "web_url": { "type": "string" },
-    "created_at": { "type": "date" },
+    "created_at": { "type": "string", "format": "date-time" },
     "bio": { "type": ["string", "null"] },
     "location": { "type": ["string", "null"] },
     "skype": { "type": "string" },
@@ -49,11 +49,11 @@
     "twitter": { "type": "string "},
     "website_url": { "type": "string" },
     "organization": { "type": ["string", "null"] },
-    "last_sign_in_at": { "type": "date" },
-    "confirmed_at": { "type": ["date", "null"] },
+    "last_sign_in_at": { "type": ["string", "null"], "format": "date-time" },
+    "confirmed_at": { "type": ["string", "null"] },
     "color_scheme_id": { "type": "integer" },
     "projects_limit": { "type": "integer" },
-    "current_sign_in_at": { "type": "date" },
+    "current_sign_in_at": { "type": ["string", "null"], "format": "date-time" },
     "identities": {
       "type": "array",
       "items": {