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
path: root/doc/ci/yaml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-23 06:10:34 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-23 06:10:34 +0300
commit6f58fccebf1da81bedcbab1e22fa41fbc1cb8926 (patch)
treeb707ac76baf8ec42375955133e088d636e714a85 /doc/ci/yaml
parent7be5d1ceaf8aeed82584e3b28d48221bbf86a7e6 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/yaml')
-rw-r--r--doc/ci/yaml/index.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md
index 87181ef8f3e..b4fc12acf9b 100644
--- a/doc/ci/yaml/index.md
+++ b/doc/ci/yaml/index.md
@@ -3807,11 +3807,11 @@ step-3:
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15536) in GitLab 12.7.
-Sometimes running multiple jobs or pipelines at the same time in an environment
+Sometimes running multiple jobs at the same time in an environment
can lead to errors during the deployment.
To avoid these errors, use the `resource_group` attribute to make sure that
-the runner doesn't run certain jobs simultaneously. Resource groups behave similar
+the runner doesn't run certain jobs concurrently. Resource groups behave similar
to semaphores in other programming languages.
When the `resource_group` keyword is defined for a job in the `.gitlab-ci.yml` file,