Add latest changes from gitlab-org/gitlab@master

6 files changed, 61 insertions, 12 deletions

diff --git a/doc/api/packages.md b/doc/api/packages.md
index 46e3b8e2d3f..cadd5f0dc75 100644
--- a/doc/api/packages.md
+++ b/doc/api/packages.md
@@ -81,7 +81,15 @@ Example response:
     },
     "created_at": "2019-11-27T03:37:38.711Z",
     "build_info": {
-      "pipeline_id": 123
+      "pipeline": {
+        "id": 123,
+        "status": "pending",
+        "ref": "new-pipeline",
+        "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+        "web_url": "https://example.com/foo/bar/pipelines/47",
+        "created_at": "2016-08-11T11:28:34.085Z",
+        "updated_at": "2016-08-11T11:32:35.169Z",
+      }
     }
   },
   {
@@ -95,7 +103,15 @@ Example response:
     },
     "created_at": "2019-11-27T03:37:38.711Z",
     "build_info": {
-      "pipeline_id": 123
+      "pipeline": {
+        "id": 123,
+        "status": "pending",
+        "ref": "new-pipeline",
+        "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+        "web_url": "https://example.com/foo/bar/pipelines/47",
+        "created_at": "2016-08-11T11:28:34.085Z",
+        "updated_at": "2016-08-11T11:32:35.169Z",
+      }
     }
   }
 ]
@@ -141,7 +157,15 @@ Example response:
   },
   "created_at": "2019-11-27T03:37:38.711Z",
   "build_info": {
-    "pipeline_id": 123
+    "pipeline": {
+      "id": 123,
+      "status": "pending",
+      "ref": "new-pipeline",
+      "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+      "web_url": "https://example.com/foo/bar/pipelines/47",
+      "created_at": "2016-08-11T11:28:34.085Z",
+      "updated_at": "2016-08-11T11:32:35.169Z",
+    }
   }
 }
 ```
diff --git a/doc/api/services.md b/doc/api/services.md
index f11cf7fd1b1..52123320651 100644
--- a/doc/api/services.md
+++ b/doc/api/services.md
@@ -19,6 +19,7 @@ Example response:
   {
     "id": 75,
     "title": "Jenkins CI",
+    "slug": "jenkins",
     "created_at": "2019-11-20T11:20:25.297Z",
     "updated_at": "2019-11-20T12:24:37.498Z",
     "active": true,
@@ -38,6 +39,7 @@ Example response:
   {
     "id": 76,
     "title": "Alerts endpoint",
+    "slug": "alerts",
     "created_at": "2019-11-20T11:20:25.297Z",
     "updated_at": "2019-11-20T12:24:37.498Z",
     "active": true,
@@ -753,6 +755,7 @@ Example response:
 {
   "id": 4,
   "title": "Slack slash commands",
+  "slug": "slack-slash-commands",
   "created_at": "2017-06-27T05:51:39-07:00",
   "updated_at": "2017-06-27T05:51:39-07:00",
   "active": true,
diff --git a/doc/ci/cloud_deployment/index.md b/doc/ci/cloud_deployment/index.md
index 3f133cd039d..07ffe5439e3 100644
--- a/doc/ci/cloud_deployment/index.md
+++ b/doc/ci/cloud_deployment/index.md
@@ -39,8 +39,25 @@ Some credentials are required to be able to run `aws` commands:
    ```yml
    deploy:
      stage: deploy
-     image: registry.gitlab.com/gitlab-org/cloud-deploy:latest
+     image: registry.gitlab.com/gitlab-org/cloud-deploy:latest # see the note below
      script:
        - aws s3 ...
        - aws create-deployment ...
    ```
+
+   NOTE: **Note:**
+   Please note that the image used in the example above
+   (`registry.gitlab.com/gitlab-org/cloud-deploy:latest`) is hosted on the [GitLab
+   Container Registry](../../user/packages/container_registry/index.md) and is
+   ready to use. Alternatively, replace the image with another one hosted on [AWS ECR](#aws-ecr).
+
+### AWS ECR
+
+Instead of referencing an image hosted on the GitLab Registry, you are free to
+reference any other image hosted on any third-party registry, such as
+[Amazon Elastic Container Registry (ECR)](https://aws.amazon.com/ecr).
+
+To do so, please make sure to [push your image into your ECR
+repository](https://docs.aws.amazon.com/AmazonECR/latest/userguide/docker-push-ecr-image.html)
+before referencing it in your `.gitlab-ci.yml` file and replace the `image`
+path to point to your ECR.
diff --git a/doc/development/gotchas.md b/doc/development/gotchas.md
index 7529278f902..09d0d71b3d7 100644
--- a/doc/development/gotchas.md
+++ b/doc/development/gotchas.md
@@ -26,7 +26,7 @@ describe API::Labels do
 
     get api("/projects/#{project.id}/labels", user)
 
-    expect(response).to have_http_status(200)
+    expect(response).to have_gitlab_http_status(:ok)
     expect(json_response.first['name']).to eq('label1')
   end
 
@@ -35,7 +35,7 @@ describe API::Labels do
 
     get api("/projects/#{project.id}/labels", user)
 
-    expect(response).to have_http_status(200)
+    expect(response).to have_gitlab_http_status(:ok)
     expect(json_response.first['name']).to eq('label1')
   end
 end
@@ -77,7 +77,7 @@ describe API::Labels do
 
     get api("/projects/#{project.id}/labels", user)
 
-    expect(response).to have_http_status(200)
+    expect(response).to have_gitlab_http_status(:ok)
     expect(json_response.first['name']).to eq('foo')
   end
 
@@ -86,7 +86,7 @@ describe API::Labels do
 
     get api("/projects/#{project.id}/labels", user)
 
-    expect(response).to have_http_status(200)
+    expect(response).to have_gitlab_http_status(:ok)
     expect(json_response.first['name']).to eq('bar')
   end
 end
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index 89598e1c8d9..44f32343151 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -17,9 +17,10 @@ special searches:
 
 | GitLab version | Elasticsearch version |
 | -------------- | --------------------- |
-| GitLab Enterprise Edition 8.4 - 8.17  | Elasticsearch 2.4 with [Delete By Query Plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/2.4/plugins-delete-by-query.html) installed |
+| GitLab Enterprise Edition 8.4 - 8.17   | Elasticsearch 2.4 with [Delete By Query Plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/2.4/plugins-delete-by-query.html) installed |
 | GitLab Enterprise Edition 9.0 - 11.4   | Elasticsearch 5.1 - 5.5 |
-| GitLab Enterprise Edition 11.5+        | Elasticsearch 5.6 - 6.x |
+| GitLab Enterprise Edition 11.5 - 12.6  | Elasticsearch 5.6 - 6.x |
+| GitLab Enterprise Edition 12.7+        | Elasticsearch 6.x - 7.x |
 
 ## Installing Elasticsearch
 
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index 9aa1849869b..d8cc5a9202d 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -786,7 +786,9 @@ A footnote reference tag looks like this:[^1]
 
 Reference tags can use letters and other characters.[^footnote-note]
 
-[^footnote-note]: Avoid using lowercase `w` or an underscore (`_`) in your tag name until until an [upstream bug](https://gitlab.com/gitlab-org/gitlab/issues/24423) is resolved.
+[^footnote-note]: Avoid using lowercase `w` or an underscore (`_`)
+in your footnote tag name until an
+[upstream bug](https://gitlab.com/gitlab-org/gitlab/issues/24423) is resolved.
 ```
 
 A footnote reference tag looks like this:[^1]
@@ -795,7 +797,9 @@ A footnote reference tag looks like this:[^1]
 
 Reference tags can use letters and other characters.[^footnote-note]
 
-[^footnote-note]: Avoid using lowercase `w` or an underscore (`_`) in your tag name until until an [upstream bug](https://gitlab.com/gitlab-org/gitlab/issues/24423) is resolved.
+[^footnote-note]: Avoid using lowercase `w` or an underscore (`_`)
+in your footnote tag name until an
+[upstream bug](https://gitlab.com/gitlab-org/gitlab/issues/24423) is resolved.
 
 ### Headers