diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-05-22 18:16:06 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-06 21:01:43 +0900 |
| commit | d5a303cf4d1d0182bb5462ca85beb29a5a821700 (patch) | |
| tree | fa9ffd0368f9bd8d7b1b72af190459b5142cf3f3 /doc/user/discussions | |
| parent | 7c965a24f51ca93196c27880843a6d187ea063cc (diff) | |
| download | gitlab-ce-d5a303cf4d1d0182bb5462ca85beb29a5a821700.tar.gz | |
Doc update
Diffstat (limited to 'doc/user/discussions')
| -rw-r--r-- | doc/user/discussions/index.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index 159109e8954..9b0ff02f227 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -11,7 +11,7 @@ You can leave a comment in the following places: - commit diffs The comment area supports [Markdown] and [quick actions]. One can edit their -own comment at any time, and anyone with [Master access level][permissions] or +own comment at any time, and anyone with [Maintainer access level][permissions] or higher can also edit a comment made by someone else. You could also reply to the notification email in order to reply to a comment, @@ -253,7 +253,7 @@ to newer issues or merge requests. - The people participating in the discussion are trolling, abusive, or otherwise being unproductive. -In these cases, a user with Master permissions or higher in the project can lock (and unlock) +In these cases, a user with Maintainer permissions or higher in the project can lock (and unlock) an issue or a merge request, using the "Lock" section in the sidebar: | Unlock | Lock | |