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>2021-08-11 12:10:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-11 12:10:00 +0300
commit564919dfc6c6b352163d4c6dc01827a5f12ffc88 (patch)
tree9e91b8dde12a3054fffc513c6e0ab0400a039a88 /doc/ci/environments
parent2000704b7a6cc9eb37dd597ed03567265eda9308 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/environments')
-rw-r--r--doc/ci/environments/index.md14
-rw-r--r--doc/ci/environments/protected_environments.md10
2 files changed, 12 insertions, 12 deletions
diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md
index 9e7855ef826..1b4d8890c6e 100644
--- a/doc/ci/environments/index.md
+++ b/doc/ci/environments/index.md
@@ -356,12 +356,12 @@ For example:
![Environment URLs in merge request](../img/environments_link_url_mr.png)
-#### Going from source files to public pages
+#### Go from source files to public pages
With GitLab [Route Maps](../review_apps/index.md#route-maps), you can go directly
from source files to public pages in the environment set for Review Apps.
-### Stopping an environment
+### Stop an environment
When you stop an environment:
@@ -491,7 +491,7 @@ The `auto_stop_in` setting is overwritten and the environment remains active unt
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/20620) in GitLab 12.10.
-You can delete [stopped environments](#stopping-an-environment) in the GitLab UI or by using
+You can delete [stopped environments](#stop-an-environment) in the GitLab UI or by using
[the API](../../api/environments.md#delete-an-environment).
To delete a stopped environment in the GitLab UI:
@@ -525,7 +525,7 @@ build:
url: https://staging.example.com
```
-This gives you access to [environment-scoped variables](#scoping-environments-with-specs),
+This gives you access to [environment-scoped variables](#scope-environments-with-specs),
and can be used to [protect builds from unauthorized access](protected_environments.md).
### Group similar environments
@@ -608,7 +608,7 @@ GitLab Auto Rollback is turned off by default. To turn it on:
1. Select the checkbox for **Enable automatic rollbacks**.
1. Select **Save changes**.
-### Monitoring environments
+### Monitor environments
To monitor the behavior of your app as it runs in each environment,
enable [Prometheus for monitoring system and response metrics](../../user/project/integrations/prometheus.md).
@@ -627,7 +627,7 @@ It may take a minute or two for data to appear after initial deployment.
![Monitoring dashboard](../img/environments_monitoring.png)
-#### Embedding metrics in GitLab Flavored Markdown
+#### Embed metrics in GitLab Flavored Markdown
Metric charts can be embedded in GitLab Flavored Markdown. See [Embedding Metrics in GitLab Flavored Markdown](../../operations/metrics/embed.md) for more details.
@@ -680,7 +680,7 @@ fetch line:
fetch = +refs/environments/*:refs/remotes/origin/environments/*
```
-### Scoping environments with specs
+### Scope environments with specs
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/2112) in [GitLab Premium](https://about.gitlab.com/pricing/) 9.4.
> - [Environment scoping for CI/CD variables was moved to all tiers](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30779) in GitLab 12.2.
diff --git a/doc/ci/environments/protected_environments.md b/doc/ci/environments/protected_environments.md
index 4d89bba9ec1..3cd4ebdbdf1 100644
--- a/doc/ci/environments/protected_environments.md
+++ b/doc/ci/environments/protected_environments.md
@@ -122,7 +122,7 @@ access to a protected environment through any of these methods:
If the user also has push or merge access to the branch deployed on production,
they have the following privileges:
-- [Stopping an environment](index.md#stopping-an-environment).
+- [Stop an environment](index.md#stop-an-environment).
- [Delete a stopped environment](index.md#delete-a-stopped-environment).
- [Create an environment terminal](index.md#web-terminals).
@@ -215,7 +215,7 @@ configured:
- Operators should be assigned the [maintainer role](../../user/permissions.md)
(or above) to the top-level group. They can maintain CI/CD configurations for
the higher environments (such as production) in the group-level settings page,
- wnich includes group-level protected environments,
+ which includes group-level protected environments,
[group-level runners](../runners/runners_scope.md#group-runners),
[group-level clusters](../../user/group/clusters/index.md), etc. Those
configurations are inherited to the child projects as read-only entries.
@@ -232,9 +232,9 @@ configured:
cannot override it.
- [Project-level protected environments](#protecting-environments) can be
combined with the group-level setting. If both group-level and project-level
- environment configurations exist, the user must be allowed in **both**
- rulesets in order to run a deployment job.
- - Within a project or a sub-group of the top-level group, developers can be
+ environment configurations exist, to run a deployment job, the user must be allowed in **both**
+ rulesets.
+ - In a project or a subgroup of the top-level group, developers can be
safely assigned the Maintainer role to tune their lower environments (such
as `testing`).