Merge branch 'ce-to-ee-2018-09-28' into 'master'

CE upstream - 2018-09-28 15:20 UTC

Closes gitlab-ce#51927

See merge request gitlab-org/gitlab-ee!7600

ee/spec/fixtures/api/schemas/job/job_details.json

@@ -3,7 +3,7 @@
     { "$ref": "../../../../../../spec/fixtures/api/schemas/job/job_details.json" },
     {
       "properties": {
-        "runner": { "$ref": "runner.json" }
+        "runners": { "$ref": "runners.json" }
       }
     }
   ]

spec/fixtures/api/schemas/job/job_details.json

@@ -4,6 +4,9 @@
   ],
   "description": "An extension of job.json with more detailed information",
   "required": [
+    "artifact",
+    "runner",
+    "runners",
     "has_trace"
   ],
   "properties": {
@@ -12,7 +15,7 @@
     "trigger": { "$ref": "trigger.json" },
     "deployment_status": { "$ref": "deployment_status.json" },
     "runner": { "$ref": "runner.json" },
-    "runners": { "type": "runners.json" },
+    "runners": { "$ref": "runners.json" },
     "has_trace": { "type": "boolean" }
   }
 }

spec/fixtures/api/schemas/job/runners.json

@@ -8,6 +8,5 @@
     "online": { "type": "boolean" },
     "available": { "type": "boolean" },
     "settings_path": { "type": "string" }
-  },
-  "additionalProperties": false
+  }
 }