diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-10-05 22:24:07 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-10-05 23:29:09 +0200 |
| commit | 7d00296cb1a831927442002b51ac15da9355dcf6 (patch) | |
| tree | b3b5697d04e986580e4d73a56a58a9065c42996f /doc | |
| parent | e182e8ff106dba64e7edfefca5be5cc685f084f0 (diff) | |
| download | gitlab-ce-7d00296cb1a831927442002b51ac15da9355dcf6.tar.gz | |
Refactor discussion lock docs
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/discussions/index.md | 30 | ||||
| -rw-r--r-- | doc/user/permissions.md | 1 |
2 files changed, 21 insertions, 10 deletions
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index f3c51d95513..ab46befb91c 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -157,31 +157,41 @@ comments in greater detail. > [Introduced][ce-14531] in GitLab 10.1. -When the discussion of an issue or a merge request is locked only team members can write new comments and edit the old ones. +There might be some cases where a discussion is better off if it's locked down. +For example: -### Modifying discussion lock +- Discussions that are several years old and the issue/merge request is closed, + but people continue to try to resurrect the discussion. +- Discussions where someone or a group of people are trolling, are abusive, or + in-general are causing the discussion to be unproductive. -To lock or unlock a dicsussion, find the Lock section in the sidebar and click **Edit**. A popup should appear and give you the option to turn on or turn off the discussion lock. +In locked discussions, only team members can write new comments and edit the old +ones. + +To lock or unlock a discussion, you need to have at least Master [permissions]: + +1. Find the "Lock" section in the sidebar and click **Edit** +1. In the dialog that will appear, you can choose to turn on or turn off the + discussion lock +1. Optionally, leave a comment to explain your reasoning behind that action | Turn off discussion lock | Turn on discussion lock | | :-----------: | :----------: | |  |  | -Every change is indicated by a system note in the issue's or merge request's comments. +Every change is indicated by a system note in the issue's or merge request's +comments.  -### Indications of locked issues or merge requests - -While you are inside the locked issue or merge request and you are a project team member you can see an indicator in the comment form that the issue or merge request is locked. - -If you are not a team member you won't see the comment form but only the information that the dicussion is locked. +Once an issue or merge request is locked, project members can see the indicator +in the comment area, whereas non project members can only see the information +that the discussion is locked. | Team member | Not a member | | :-----------: | :----------: | |  |  | - [ce-5022]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022 [ce-7125]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7125 [ce-7527]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7527 diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 44ee994a26b..aa1fa60a492 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -25,6 +25,7 @@ The following table depicts the various user permission levels in a project. | Create confidential issue | ✓ [^1] | ✓ | ✓ | ✓ | ✓ | | View confidential issues | (✓) [^2] | ✓ | ✓ | ✓ | ✓ | | Leave comments | ✓ [^1] | ✓ | ✓ | ✓ | ✓ | +| Lock comments | | | | ✓ | ✓ | | See a list of jobs | ✓ [^3] | ✓ | ✓ | ✓ | ✓ | | See a job log | ✓ [^3] | ✓ | ✓ | ✓ | ✓ | | Download and browse job artifacts | ✓ [^3] | ✓ | ✓ | ✓ | ✓ | |