Add latest changes from gitlab-org/gitlab@master

5 files changed, 69 insertions, 29 deletions

diff --git a/doc/administration/geo/replication/database.md b/doc/administration/geo/replication/database.md
index dd7cf9f5710..72c3692716b 100644
--- a/doc/administration/geo/replication/database.md
+++ b/doc/administration/geo/replication/database.md
@@ -155,8 +155,8 @@ There is an [issue where support is being discussed](https://gitlab.com/gitlab-o
    | `postgresql['md5_auth_cidr_addresses']` | **Secondary** node's public or VPC private addresses. |
 
    If you are using Google Cloud Platform, SoftLayer, or any other vendor that
-   provides a virtual private cloud (VPC) you can use the **secondary** node's private
-   address (corresponds to "internal address" for Google Cloud Platform) for
+   provides a virtual private cloud (VPC) you can use the **primary** and **secondary** nodes
+   private addresses (corresponds to "internal address" for Google Cloud Platform) for
    `postgresql['md5_auth_cidr_addresses']` and `postgresql['listen_address']`.
 
    The `listen_address` option opens PostgreSQL up to network connections with the interface
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 0d34e3136dc..7089ee8e51d 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -4552,6 +4552,16 @@ type Project {
   ): SentryDetailedError
 
   """
+  E-mail address of the service desk.
+  """
+  serviceDeskAddress: String
+
+  """
+  Indicates if the project has service desk enabled.
+  """
+  serviceDeskEnabled: Boolean
+
+  """
   Indicates if shared runners are enabled on the project
   """
   sharedRunnersEnabled: Boolean
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 833a230fd3f..aa7951e6bf7 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -1315,6 +1315,34 @@
               "deprecationReason": null
             },
             {
+              "name": "serviceDeskAddress",
+              "description": "E-mail address of the service desk.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "serviceDeskEnabled",
+              "description": "Indicates if the project has service desk enabled.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "sharedRunnersEnabled",
               "description": "Indicates if shared runners are enabled on the project",
               "args": [
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index b96666915f9..ec9b586d065 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -668,6 +668,8 @@ The API can be explored interactively using the [GraphiQL IDE](../index.md#graph
 | `mergeRequest` | MergeRequest | A single merge request of the project |
 | `issue` | Issue | A single issue of the project |
 | `sentryDetailedError` | SentryDetailedError | Detailed version of a Sentry error on the project |
+| `serviceDeskEnabled` | Boolean | Indicates if the project has service desk enabled. |
+| `serviceDeskAddress` | String | E-mail address of the service desk. |
 
 ### ProjectPermissions
 
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",