summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Wu <victor@gitlab.com>2018-03-09 10:00:28 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-03-09 10:00:28 +0000
commit3d98b89b09f6cd9059dde5ca9ca26246ecb74a1d (patch)
tree6bc4b2d8f8cbfe2c4f83f2511da12b25e5a1a407
parent5189fddfb232b398c4eeadd6c6fa528ea657a3d2 (diff)
downloadgitlab-ce-3d98b89b09f6cd9059dde5ca9ca26246ecb74a1d.tar.gz
Correct permissions for locking discussions
-rw-r--r--doc/user/permissions.md3
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] | ✓ | ✓ | ✓ | ✓ |