diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-15 14:41:01 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-15 14:41:01 +0000 |
| commit | 50eeb3218d69561a82cd81b955c2d306d548d8de (patch) | |
| tree | 58a5cafcd23b63ecf3547d38b06f43e0e672952c /doc | |
| parent | 00f002edf2f80266550d58d6233de2d07f5248ca (diff) | |
| parent | ff423bbb290f3bcb8b6d2859c67d428ac80f681e (diff) | |
| download | gitlab-ce-50eeb3218d69561a82cd81b955c2d306d548d8de.tar.gz | |
Merge branch 'user-permission-doc-fix' into 'master'
doc/user/permissions: update option and menu names
## What does this MR do?
This fixes `doc/user/permissions.md` documentation.
## Are there points in the code the reviewer needs to double check?
The reviewer can check that the name of the option is now **Public pipelines** and that this option is in **Project Settings > CI/CD Pipelines**.
## Why was this MR needed?
Because the previous name of the option and of the menu had not been updated in `doc/user/permissions.md` when they were changed.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
This is a documentation only MR, so I don't think it needs to pass all these acceptance criteria.
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
I don't know of any issue number.
See merge request !6302
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/permissions.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 1498cb361c8..f1b75298180 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -63,7 +63,7 @@ The following table depicts the various user permission levels in a project. | Force push to protected branches [^2] | | | | | | | Remove protected branches [^2] | | | | | | -[^1]: If **Allow guest to access builds** is enabled in CI settings +[^1]: If **Public pipelines** is enabled in **Project Settings > CI/CD Pipelines** [^2]: Not allowed for Guest, Reporter, Developer, Master, or Owner ## Group |