Add latest changes from gitlab-org/gitlab@master

1 files changed, 27 insertions, 27 deletions

diff --git a/doc/api/jobs.md b/doc/api/jobs.md
index bafcfd110d3..5f661ac4c76 100644
--- a/doc/api/jobs.md
+++ b/doc/api/jobs.md
@@ -2,7 +2,7 @@
 
 ## List project jobs
 
-Get a list of jobs in a project.
+Get a list of jobs in a project. Jobs are sorted in descending order of their IDs.
 
 ```
 GET /projects/:id/jobs
@@ -33,13 +33,23 @@ Example of response
     },
     "coverage": null,
     "allow_failure": false,
-    "created_at": "2015-12-24T15:51:21.727Z",
-    "started_at": "2015-12-24T17:54:24.729Z",
-    "finished_at": "2015-12-24T17:54:24.921Z",
-    "duration": 0.192,
-    "artifacts_expire_at": "2016-01-23T17:54:24.921Z",
-    "id": 6,
-    "name": "rspec:other",
+    "created_at": "2015-12-24T15:51:21.802Z",
+    "started_at": "2015-12-24T17:54:27.722Z",
+    "finished_at": "2015-12-24T17:54:27.895Z",
+    "duration": 0.173,
+    "artifacts_file": {
+      "filename": "artifacts.zip",
+      "size": 1000
+    },
+    "artifacts": [
+      {"file_type": "archive", "size": 1000, "filename": "artifacts.zip", "file_format": "zip"},
+      {"file_type": "metadata", "size": 186, "filename": "metadata.gz", "file_format": "gzip"},
+      {"file_type": "trace", "size": 1500, "filename": "job.log", "file_format": "raw"},
+      {"file_type": "junit", "size": 750, "filename": "junit.xml.gz", "file_format": "gzip"}
+    ],
+    "artifacts_expire_at": "2016-01-23T17:54:27.895Z",
+    "id": 7,
+    "name": "teaspoon",
     "pipeline": {
       "id": 6,
       "ref": "master",
@@ -52,7 +62,7 @@ Example of response
     "stage": "test",
     "status": "failed",
     "tag": false,
-    "web_url": "https://example.com/foo/bar/-/jobs/6",
+    "web_url": "https://example.com/foo/bar/-/jobs/7",
     "user": {
       "id": 1,
       "name": "Administrator",
@@ -83,23 +93,13 @@ Example of response
     },
     "coverage": null,
     "allow_failure": false,
-    "created_at": "2015-12-24T15:51:21.802Z",
-    "started_at": "2015-12-24T17:54:27.722Z",
-    "finished_at": "2015-12-24T17:54:27.895Z",
-    "duration": 0.173,
-    "artifacts_file": {
-      "filename": "artifacts.zip",
-      "size": 1000
-    },
-    "artifacts": [
-      {"file_type": "archive", "size": 1000, "filename": "artifacts.zip", "file_format": "zip"},
-      {"file_type": "metadata", "size": 186, "filename": "metadata.gz", "file_format": "gzip"},
-      {"file_type": "trace", "size": 1500, "filename": "job.log", "file_format": "raw"},
-      {"file_type": "junit", "size": 750, "filename": "junit.xml.gz", "file_format": "gzip"}
-    ],
-    "artifacts_expire_at": "2016-01-23T17:54:27.895Z",
-    "id": 7,
-    "name": "teaspoon",
+    "created_at": "2015-12-24T15:51:21.727Z",
+    "started_at": "2015-12-24T17:54:24.729Z",
+    "finished_at": "2015-12-24T17:54:24.921Z",
+    "duration": 0.192,
+    "artifacts_expire_at": "2016-01-23T17:54:24.921Z",
+    "id": 6,
+    "name": "rspec:other",
     "pipeline": {
       "id": 6,
       "ref": "master",
@@ -112,7 +112,7 @@ Example of response
     "stage": "test",
     "status": "failed",
     "tag": false,
-    "web_url": "https://example.com/foo/bar/-/jobs/7",
+    "web_url": "https://example.com/foo/bar/-/jobs/6",
     "user": {
       "id": 1,
       "name": "Administrator",