Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-08 09:09:54 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-08 09:09:54 +0300
commitf6cdec670b9b757fc2225a2c6627ab79765e5b8a (patch)
tree7a1fde030f117b69332d01b22deefd1c81fff458 /doc/user/project
parente2ee1eec50aa8df8543d7ecc585ec0ba5ee544ac (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project')
-rw-r--r--doc/user/project/clusters/add_eks_clusters.md2
-rw-r--r--doc/user/project/highlighting.md2
-rw-r--r--doc/user/project/integrations/prometheus.md2
-rw-r--r--doc/user/project/merge_requests/creating_merge_requests.md2
-rw-r--r--doc/user/project/operations/feature_flags.md8
5 files changed, 8 insertions, 8 deletions
diff --git a/doc/user/project/clusters/add_eks_clusters.md b/doc/user/project/clusters/add_eks_clusters.md
index 82b3cb49075..7fa8ec6c5f3 100644
--- a/doc/user/project/clusters/add_eks_clusters.md
+++ b/doc/user/project/clusters/add_eks_clusters.md
@@ -245,7 +245,7 @@ To add an existing EKS cluster to your project, group, or instance:
token: <authentication_token>
```
- 1. Locate the the API server endpoint so GitLab can connect to the cluster. This is displayed on
+ 1. Locate the API server endpoint so GitLab can connect to the cluster. This is displayed on
the AWS EKS console, when viewing the EKS cluster details.
1. Navigate to your:
- Project's **{cloud-gear}** **Operations > Kubernetes** page, for a project-level cluster.
diff --git a/doc/user/project/highlighting.md b/doc/user/project/highlighting.md
index 85992e1301f..2bdb0ae2706 100644
--- a/doc/user/project/highlighting.md
+++ b/doc/user/project/highlighting.md
@@ -10,7 +10,7 @@ If GitLab is guessing wrong, you can override its choice of language using the `
When you check in and push that change, all `*.pl` files in your project will be highlighted as Prolog.
-The paths here are simply Git's built-in [`.gitattributes` interface](https://git-scm.com/docs/gitattributes). So, if you were to invent a file format called a `Nicefile` at the root of your project that used ruby syntax, all you need is:
+The paths here are simply Git's built-in [`.gitattributes` interface](https://git-scm.com/docs/gitattributes). So, if you were to invent a file format called a `Nicefile` at the root of your project that used Ruby syntax, all you need is:
``` conf
/Nicefile gitlab-language=ruby
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index bbed9ae4686..273ab9095c0 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -397,7 +397,7 @@ Starting in [version 12.8](https://gitlab.com/gitlab-org/gitlab/issues/202696),
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16530) in GitLab 12.5.
-To add an anomaly chart panel type to a dashboard, add add a panel with *exactly* 3 metrics.
+To add an anomaly chart panel type to a dashboard, add a panel with *exactly* 3 metrics.
The first metric represents the current state, and the second and third metrics represent the upper and lower limit respectively:
diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md
index e8c691a3d7f..d8a2b427288 100644
--- a/doc/user/project/merge_requests/creating_merge_requests.md
+++ b/doc/user/project/merge_requests/creating_merge_requests.md
@@ -28,7 +28,7 @@ button and start a merge request from there.
## New Merge Request page
On the **New Merge Request** page, start by filling in the title
-and description for the merge request. If there are are already
+and description for the merge request. If there are already
commits on the branch, the title will be prefilled with the first
line of the first commit message, and the description will be
prefilled with any additional lines in the commit message.
diff --git a/doc/user/project/operations/feature_flags.md b/doc/user/project/operations/feature_flags.md
index 86d8e829648..f13fbcb2722 100644
--- a/doc/user/project/operations/feature_flags.md
+++ b/doc/user/project/operations/feature_flags.md
@@ -175,10 +175,10 @@ a number of community contributed libraries.
Official clients:
-- [unleash/unleash-client-java](https://github.com/unleash/unleash-client-java)
-- [unleash/unleash-client-node](https://github.com/unleash/unleash-client-node)
-- [unleash/unleash-client-go](https://github.com/unleash/unleash-client-go)
-- [unleash/unleash-client-ruby](https://github.com/unleash/unleash-client-ruby)
+- [Unleash client SDK for Java](https://github.com/unleash/unleash-client-java)
+- [Unleash client SDK for Node.js](https://github.com/unleash/unleash-client-node)
+- [Unleash client for Go](https://github.com/unleash/unleash-client-go)
+- [Unleash client for Ruby](https://github.com/unleash/unleash-client-ruby)
Community contributed clients: