diff options
| -rw-r--r-- | doc/ci/yaml/README.md | 18 | ||||
| -rw-r--r-- | doc/user/permissions.md | 4 |
2 files changed, 12 insertions, 10 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 6764c44546c..e6d83d31e36 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -986,10 +986,6 @@ The above script will: > - Blocking manual actions were introduced in GitLab 9.0. > - Protected actions were introduced in GitLab 9.2. -NOTE: **Note:** -Using `when:manual` and `trigger` together will result in the error `jobs:#{job-name} when should be on_success, on_failure or always`. -This is because `when:manual` will prevent any trigger from being used. - Manual actions are a special type of job that are not executed automatically, they need to be explicitly started by a user. An example usage of manual actions would be a deployment to a production environment. Manual actions can be started @@ -1017,6 +1013,11 @@ a user wants to trigger an action. In other words, in order to trigger a manual action assigned to a branch that the pipeline is running for, the user needs to have the ability to merge to this branch. +NOTE: **Note:** +Using `when:manual` and `trigger` together results in the error `jobs:#{job-name} when +should be on_success, on_failure or always`, because `when:manual` prevents triggers +being used. + #### `when:delayed` > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/21767) in GitLab 11.4. @@ -2068,16 +2069,17 @@ job split into three separate jobs. > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/8997) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.8. -NOTE: **Note:** -Using a `trigger` with `when:manual` together it will result in the error `jobs:#{job-name} when should be on_success, on_failure or always`. -This is because `when:manual` will prevent any trigger from being used. - `trigger` allows you to define downstream pipeline trigger. When a job created from `trigger` definition is started by GitLab, a downstream pipeline gets created. Learn more about [multi-project pipelines](../multi_project_pipelines.md#creating-multi-project-pipelines-from-gitlab-ciyml). +NOTE: **Note:** +Using a `trigger` with `when:manual` together results in the error `jobs:#{job-name} +when should be on_success, on_failure or always`, because `when:manual` prevents +triggers being used. + #### Simple `trigger` syntax The most simple way to configure a downstream trigger to use `trigger` keyword diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 2025832a714..c911336d274 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -133,10 +133,10 @@ The following table depicts the various user permission levels in a project. | Force push to protected branches (*4*) | | | | | | | Remove protected branches (*4*) | | | | | | -- (*1*): All users are able to perform this action on public and internal projects, but not private projects. +- (*1*): Guest users are able to perform this action on public and internal projects, but not private projects. - (*2*): Guest users can only view the confidential issues they created themselves - (*3*): If **Public pipelines** is enabled in **Project Settings > CI/CD** -- (*4*): Not allowed for Guest, Reporter, Developer, Maintainer, or Owner +- (*4*): Not allowed for Guest, Reporter, Developer, Maintainer, or Owner. See [Protected Branches](./project/protected_branches.md). ## Project features permissions |