Add latest changes from gitlab-org/gitlab@master

3 files changed, 32 insertions, 12 deletions

diff --git a/app/validators/json_schemas/build_report_result_data.json b/app/validators/json_schemas/build_report_result_data.json
index 0a12c9c39a7..d109389a046 100644
--- a/app/validators/json_schemas/build_report_result_data.json
+++ b/app/validators/json_schemas/build_report_result_data.json
@@ -3,11 +3,16 @@
   "description": "Build report result data",
   "type": "object",
   "properties": {
-    "coverage": { "type": "float" },
+    "coverage": {
+      "type": "number",
+      "format": "float"
+    },
     "tests": {
       "type": "object",
-      "items": { "$ref": "./build_report_result_data_tests.json" }
+      "items": {
+        "$ref": "./build_report_result_data_tests.json"
+      }
     }
   },
   "additionalProperties": false
-}
+}
\ No newline at end of file
diff --git a/app/validators/json_schemas/build_report_result_data_tests.json b/app/validators/json_schemas/build_report_result_data_tests.json
index 610070fde5f..3b6a2688313 100644
--- a/app/validators/json_schemas/build_report_result_data_tests.json
+++ b/app/validators/json_schemas/build_report_result_data_tests.json
@@ -3,12 +3,24 @@
   "description": "Build report result data tests",
   "type": "object",
   "properties": {
-    "name": { "type": "string" },
-    "duration": { "type": "string" },
-    "failed": { "type": "integer" },
-    "errored": { "type": "integer" },
-    "skipped": { "type": "integer" },
-    "success": { "type": "integer" }
+    "name": {
+      "type": "string"
+    },
+    "duration": {
+      "type": "string"
+    },
+    "failed": {
+      "type": "integer"
+    },
+    "errored": {
+      "type": "integer"
+    },
+    "skipped": {
+      "type": "integer"
+    },
+    "success": {
+      "type": "integer"
+    }
   },
   "additionalProperties": false
-}
+}
\ No newline at end of file
diff --git a/app/validators/json_schemas/daily_build_group_report_result_data.json b/app/validators/json_schemas/daily_build_group_report_result_data.json
index 2b073506375..5b153b47b1e 100644
--- a/app/validators/json_schemas/daily_build_group_report_result_data.json
+++ b/app/validators/json_schemas/daily_build_group_report_result_data.json
@@ -3,7 +3,10 @@
   "description": "Daily build group report result data",
   "type": "object",
   "properties": {
-    "coverage": { "type": "float" }
+    "coverage": {
+      "type": "number",
+      "format": "float"
+    }
   },
   "additionalProperties": false
-}
+}
\ No newline at end of file