diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-03-09 10:00:29 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-03-09 10:00:29 +0000 |
| commit | f2723fc3e9c4f7923255f2644932e129a8047653 (patch) | |
| tree | 6bc4b2d8f8cbfe2c4f83f2511da12b25e5a1a407 | |
| parent | 5189fddfb232b398c4eeadd6c6fa528ea657a3d2 (diff) | |
| parent | 3d98b89b09f6cd9059dde5ca9ca26246ecb74a1d (diff) | |
| download | gitlab-ce-f2723fc3e9c4f7923255f2644932e129a8047653.tar.gz | |
Merge branch 'docs-correct-permissions-for-lock-discussions' into 'master'
Correct permissions for locking discussions
See merge request gitlab-org/gitlab-ce!17653
| -rw-r--r-- | doc/user/permissions.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 914a80bcd6a..a520279c29e 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -25,7 +25,8 @@ The following table depicts the various user permission levels in a project. | Create confidential issue | ✓ [^1] | ✓ | ✓ | ✓ | ✓ | | View confidential issues | (✓) [^2] | ✓ | ✓ | ✓ | ✓ | | Leave comments | ✓ [^1] | ✓ | ✓ | ✓ | ✓ | -| Lock discussions (issues and merge requests) | | | | ✓ | ✓ | +| Lock issue discussions | | ✓ | ✓ | ✓ | ✓ | +| Lock merge request discussions | | | ✓ | ✓ | ✓ | | See a list of jobs | ✓ [^3] | ✓ | ✓ | ✓ | ✓ | | See a job log | ✓ [^3] | ✓ | ✓ | ✓ | ✓ | | Download and browse job artifacts | ✓ [^3] | ✓ | ✓ | ✓ | ✓ | |