diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 03:09:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 03:09:31 +0000 |
commit | e2ee1eec50aa8df8543d7ecc585ec0ba5ee544ac (patch) | |
tree | 7998650d27ada12ee7d06a21cbb3b5e89f298378 /doc/user/project | |
parent | 060c842402c00f830a810702600cbe39dfa6cf62 (diff) | |
download | gitlab-ce-e2ee1eec50aa8df8543d7ecc585ec0ba5ee544ac.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project')
-rw-r--r-- | doc/user/project/clusters/add_eks_clusters.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/irker.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/prometheus.md | 2 | ||||
-rw-r--r-- | doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md | 2 | ||||
-rw-r--r-- | doc/user/project/web_ide/index.md | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/user/project/clusters/add_eks_clusters.md b/doc/user/project/clusters/add_eks_clusters.md index 6bde461dfa6..82b3cb49075 100644 --- a/doc/user/project/clusters/add_eks_clusters.md +++ b/doc/user/project/clusters/add_eks_clusters.md @@ -279,7 +279,7 @@ If a default Storage Class doesn't already exist and is desired, follow Amazon's to create one. Alternatively, disable PostgreSQL by setting the project variable -[`POSTGRES_ENABLED`](../../../topics/autodevops/#environment-variables) to `false`. +[`POSTGRES_ENABLED`](../../../topics/autodevops/customize.md#environment-variables) to `false`. ### Deploy the app to EKS diff --git a/doc/user/project/integrations/irker.md b/doc/user/project/integrations/irker.md index f7e129d1e7f..db5397ee7d5 100644 --- a/doc/user/project/integrations/irker.md +++ b/doc/user/project/integrations/irker.md @@ -4,7 +4,7 @@ GitLab provides a way to push update messages to an Irker server. When configured, pushes to a project will trigger the service to send data directly to the Irker server. -See the project homepage for further info: <https://gitlab.com/esr/irker> +See the project homepage for further information: <https://gitlab.com/esr/irker> ## Needed setup diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 6d848f73cb6..bbed9ae4686 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -775,7 +775,7 @@ GitLab unfurls the link as an embedded metrics panel: ![Embedded Metrics Rendered](img/embedded_metrics_rendered_v12_8.png) You can also embed a single chart. To get a link to a chart, click the -**{ellipsis_v}** **More info** menu in the upper right corner of the chart, +**{ellipsis_v}** **More actions** menu in the upper right corner of the chart, and select **Copy link to chart**, as shown in this example: ![Copy Link To Chart](img/copy_link_to_chart_v12_10.png) diff --git a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md index cde6ffaa48c..bb5aadfa9b9 100644 --- a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md +++ b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md @@ -116,7 +116,7 @@ environment. Deployments that are ongoing will be shown, as well as the deploying/deployed state for environments. If it's the first time the branch is deployed, the link will return a `404` error until done. During the deployment, the stop button will -be disabled. If the pipeline fails to deploy, the deployment info will be hidden. +be disabled. If the pipeline fails to deploy, the deployment information will be hidden. ![Merge request pipeline](img/merge_request_pipeline.png) diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md index 23b72e33aae..c98448ff904 100644 --- a/doc/user/project/web_ide/index.md +++ b/doc/user/project/web_ide/index.md @@ -270,7 +270,7 @@ terminal: - The `webide-file-sync` executable must start **after** the project directory is available. This is why we need to add `sleep 5` to the `command`. See [this issue](https://gitlab.com/gitlab-org/webide-file-sync/issues/7) for - more info. + more information. - `$CI_PROJECT_DIR` is a [predefined environment variable](../../../ci/variables/predefined_variables.md) for GitLab Runners. This is where your project's repository will be. |