diff options
| author | Evan Read <eread@gitlab.com> | 2019-03-22 01:41:40 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-03-22 01:41:40 +0000 |
| commit | d81f048796780b97270c3cf1c9bff00db9ad8ca3 (patch) | |
| tree | feecd99834cbd3f98e5c6c4c110fe0cfc2aefd6b | |
| parent | 03b0b827ffd46905a7cf7ff7c01580275173271d (diff) | |
| parent | 1911283d5c6d55f1fbef30309fb458e9785a3e83 (diff) | |
| download | gitlab-ce-d81f048796780b97270c3cf1c9bff00db9ad8ca3.tar.gz | |
Merge branch 'docs/wiki-permissions' into 'master'
Clarify wiki permissions
Closes #53964
See merge request gitlab-org/gitlab-ce!23044
| -rw-r--r-- | doc/user/permissions.md | 3 | ||||
| -rw-r--r-- | doc/user/project/wiki/index.md | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 9db1e43fdf2..3b3dc60cb48 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -48,6 +48,8 @@ The following table depicts the various user permission levels in a project. | See a job log | ✓ [^3] | ✓ | ✓ | ✓ | ✓ | | Download and browse job artifacts | ✓ [^3] | ✓ | ✓ | ✓ | ✓ | | View wiki pages | ✓ [^1] | ✓ | ✓ | ✓ | ✓ | +| Create and edit wiki pages | | | ✓ | ✓ | ✓ | +| Delete wiki pages | | | | ✓ | ✓ | | View license management reports **[ULTIMATE]** | ✓ [^1] | ✓ | ✓ | ✓ | ✓ | | View Security reports **[ULTIMATE]** | ✓ [^1] | ✓ | ✓ | ✓ | ✓ | | View project code | [^1] | ✓ | ✓ | ✓ | ✓ | @@ -80,7 +82,6 @@ The following table depicts the various user permission levels in a project. | Force push to non-protected branches | | | ✓ | ✓ | ✓ | | Remove non-protected branches | | | ✓ | ✓ | ✓ | | Add tags | | | ✓ | ✓ | ✓ | -| Write a wiki | | | ✓ | ✓ | ✓ | | Cancel and retry jobs | | | ✓ | ✓ | ✓ | | Create or update commit status | | | ✓ | ✓ | ✓ | | Update a container registry | | | ✓ | ✓ | ✓ | diff --git a/doc/user/project/wiki/index.md b/doc/user/project/wiki/index.md index 127a30d6669..532247a98cd 100644 --- a/doc/user/project/wiki/index.md +++ b/doc/user/project/wiki/index.md @@ -12,10 +12,6 @@ You can create Wiki pages in the web interface or [locally using Git](#adding-and-editing-wiki-pages-locally) since every Wiki is a separate Git repository. ->**Note:** -A [permission level][permissions] of **Guest** is needed to view a Wiki and -**Developer** is needed to create and edit Wiki pages. - ## First time creating the Home page The first time you visit a Wiki, you will be directed to create the Home page. @@ -28,6 +24,9 @@ message. ## Creating a new wiki page +NOTE: **Note:** +A [permission level][permissions] of **Developer** is needed to create Wiki pages. + Create a new page by clicking the **New page** button that can be found in all wiki pages. You will be asked to fill in the page name from which GitLab will create the path to the page. You can specify a full path for the new file @@ -58,12 +57,18 @@ repository, you will have to upload them again. ## Editing a wiki page +NOTE: **Note:** +A [permission level][permissions] of **Developer** is needed to edit Wiki pages. + To edit a page, simply click on the **Edit** button. From there on, you can change its content. When done, click **Save changes** for the changes to take effect. ## Deleting a wiki page +NOTE: **Note:** +A [permission level][permissions] of **Maintainer** is needed to delete Wiki pages. + You can find the **Delete** button only when editing a page. Click on it and confirm you want the page to be deleted. |