From e182e8ff106dba64e7edfefca5be5cc685f084f0 Mon Sep 17 00:00:00 2001 From: Jarka Kadlecova Date: Wed, 4 Oct 2017 14:09:20 +0200 Subject: Add documentation for discussion lock --- .../img/discussion_lock_system_notes.png | Bin 0 -> 50200 bytes doc/user/discussions/img/lock_form_member.png | Bin 0 -> 100581 bytes doc/user/discussions/img/lock_form_non_member.png | Bin 0 -> 37432 bytes doc/user/discussions/img/turn_off_lock.png | Bin 0 -> 31580 bytes doc/user/discussions/img/turn_on_lock.png | Bin 0 -> 34839 bytes doc/user/discussions/index.md | 30 +++++++++++++++++++++ 6 files changed, 30 insertions(+) create mode 100644 doc/user/discussions/img/discussion_lock_system_notes.png create mode 100644 doc/user/discussions/img/lock_form_member.png create mode 100644 doc/user/discussions/img/lock_form_non_member.png create mode 100644 doc/user/discussions/img/turn_off_lock.png create mode 100644 doc/user/discussions/img/turn_on_lock.png (limited to 'doc/user') diff --git a/doc/user/discussions/img/discussion_lock_system_notes.png b/doc/user/discussions/img/discussion_lock_system_notes.png new file mode 100644 index 00000000000..8e8e8e0bc3d Binary files /dev/null and b/doc/user/discussions/img/discussion_lock_system_notes.png differ diff --git a/doc/user/discussions/img/lock_form_member.png b/doc/user/discussions/img/lock_form_member.png new file mode 100644 index 00000000000..01c6308d24c Binary files /dev/null and b/doc/user/discussions/img/lock_form_member.png differ diff --git a/doc/user/discussions/img/lock_form_non_member.png b/doc/user/discussions/img/lock_form_non_member.png new file mode 100644 index 00000000000..3bb70b69580 Binary files /dev/null and b/doc/user/discussions/img/lock_form_non_member.png differ diff --git a/doc/user/discussions/img/turn_off_lock.png b/doc/user/discussions/img/turn_off_lock.png new file mode 100644 index 00000000000..dd05b398a8b Binary files /dev/null and b/doc/user/discussions/img/turn_off_lock.png differ diff --git a/doc/user/discussions/img/turn_on_lock.png b/doc/user/discussions/img/turn_on_lock.png new file mode 100644 index 00000000000..9597da4e14d Binary files /dev/null and b/doc/user/discussions/img/turn_on_lock.png differ diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index efea99eb120..f3c51d95513 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -153,12 +153,42 @@ comments in greater detail. ![Discussion comment](img/discussion_comment.png) +## Locking discussions + +> [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. + +### Modifying discussion lock + +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. + +| Turn off discussion lock | Turn on discussion lock | +| :-----------: | :----------: | +| ![Turn off discussion lock](img/turn_off_lock.png) | ![Turn on discussion lock](img/turn_on_lock.png) | + +Every change is indicated by a system note in the issue's or merge request's comments. + +![Discussion lock system notes](img/discussion_lock_system_notes.png) + +### 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. + +| Team member | Not a member | +| :-----------: | :----------: | +| ![Comment form member](img/lock_form_member.png) | ![Comment form non-member](img/lock_form_non_member.png) | + + [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 [ce-7180]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7180 [ce-8266]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8266 [ce-14053]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14053 +[ce-14531]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14531 [resolve-discussion-button]: img/resolve_discussion_button.png [resolve-comment-button]: img/resolve_comment_button.png [discussion-view]: img/discussion_view.png -- cgit v1.2.1