debian-mirror-gitlab/doc/user/discussions/index.md

357 lines
14 KiB
Markdown
Raw Normal View History

2020-06-23 00:09:42 +05:30
---
2020-10-24 23:57:45 +05:30
stage: Create
2021-04-17 20:07:23 +05:30
group: Code Review
2021-02-22 17:27:13 +05:30
info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments"
2020-10-24 23:57:45 +05:30
type: reference, howto
2020-06-23 00:09:42 +05:30
---
2021-03-11 19:13:27 +05:30
# Threads **(FREE)**
2017-08-17 22:00:37 +05:30
2021-03-11 19:13:27 +05:30
GitLab encourages communication through comments, threads, and suggestions.
2017-08-17 22:00:37 +05:30
2021-03-11 19:13:27 +05:30
For example, you can create a comment in the following places:
2017-08-17 22:00:37 +05:30
2020-03-13 15:44:24 +05:30
- Issues
2021-03-11 19:13:27 +05:30
- Epics
2020-03-13 15:44:24 +05:30
- Merge requests
- Snippets
- Commits
- Commit diffs
2017-08-17 22:00:37 +05:30
2019-07-07 11:18:12 +05:30
There are standard comments, and you also have the option to create a comment
2019-09-30 21:07:59 +05:30
in the form of a thread. A comment can also be [turned into a thread](#start-a-thread-by-replying-to-a-standard-comment)
2019-07-07 11:18:12 +05:30
when it receives a reply.
2018-05-09 12:01:36 +05:30
2020-04-22 19:07:51 +05:30
The comment area supports [Markdown](../markdown.md) and [quick actions](../project/quick_actions.md). You can edit your own
comment at any time, and anyone with [Maintainer access level](../permissions.md) or
2019-07-07 11:18:12 +05:30
higher can also edit a comment made by someone else.
2019-05-30 16:15:17 +05:30
2019-07-07 11:18:12 +05:30
You can also reply to a comment notification email to reply to the comment if
2020-04-22 19:07:51 +05:30
[Reply by email](../../administration/reply_by_email.md) is configured for your GitLab instance. Replying to a standard comment
2019-09-30 21:07:59 +05:30
creates another standard comment. Replying to a threaded comment creates a reply in the thread. Email replies support
2020-04-22 19:07:51 +05:30
[Markdown](../markdown.md) and [quick actions](../project/quick_actions.md), just as if you replied from the web.
2017-08-17 22:00:37 +05:30
2021-02-22 17:27:13 +05:30
NOTE:
2019-12-21 20:55:43 +05:30
There is a limit of 5,000 comments for every object, for example: issue, epic, and merge request.
2019-09-30 21:07:59 +05:30
## Resolvable comments and threads
2017-08-17 22:00:37 +05:30
2020-03-13 15:44:24 +05:30
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5022) in GitLab 8.11.
2019-09-30 21:07:59 +05:30
> - Resolvable threads can be added only to merge request diffs.
2021-04-17 20:07:23 +05:30
> - Resolving comments individually was [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/28750) in GitLab 13.6.
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
Thread resolution helps keep track of progress during planning or code review.
2019-05-18 00:54:41 +05:30
2021-04-17 20:07:23 +05:30
Every thread in merge requests, commits, commit diffs, and
2019-07-07 11:18:12 +05:30
snippets is initially displayed as unresolved. They can then be individually resolved by anyone
with at least Developer access to the project or by the author of the change being reviewed.
2021-03-11 19:13:27 +05:30
If the thread has been resolved and a non-member un-resolves their own response,
2021-04-17 20:07:23 +05:30
this also unresolves the discussion thread.
If the non-member then resolves this same response, this resolves the discussion thread.
2017-08-17 22:00:37 +05:30
2021-04-17 20:07:23 +05:30
The need to resolve threads prevents you from forgetting to address feedback and lets you
hide threads that are no longer relevant.
2019-07-07 11:18:12 +05:30
2019-09-30 21:07:59 +05:30
!["A thread between two people on a piece of code"](img/thread_view.png)
2019-05-30 16:15:17 +05:30
2019-09-30 21:07:59 +05:30
### Commit threads in the context of a merge request
2018-03-17 18:26:18 +05:30
2019-09-30 21:07:59 +05:30
For reviewers with commit-based workflow, it may be useful to add threads to
2021-04-17 20:07:23 +05:30
specific commit diffs in the context of a merge request. These threads
2018-03-17 18:26:18 +05:30
persist through a commit ID change when:
- force-pushing after a rebase
- amending a commit
2019-09-30 21:07:59 +05:30
To create a commit diff thread:
2018-03-17 18:26:18 +05:30
1. Navigate to the merge request **Commits** tab. A list of commits that
2021-04-17 20:07:23 +05:30
constitute the merge request are shown.
2018-03-17 18:26:18 +05:30
2019-10-12 21:52:04 +05:30
![Merge request commits tab](img/merge_request_commits_tab.png)
2018-03-17 18:26:18 +05:30
2021-04-17 20:07:23 +05:30
1. Navigate to a specific commit, select the **Changes** tab (where you
are only be presented diffs from the selected commit), and leave a comment.
2018-03-17 18:26:18 +05:30
2019-10-12 21:52:04 +05:30
![Commit diff discussion in merge request context](img/commit_comment_mr_context.png)
2018-03-17 18:26:18 +05:30
2021-04-17 20:07:23 +05:30
1. Any threads created this way are shown in the merge request's
2018-03-17 18:26:18 +05:30
**Discussions** tab and are resolvable.
2019-10-12 21:52:04 +05:30
![Merge request Discussions tab](img/commit_comment_mr_discussions_tab.png)
2018-03-17 18:26:18 +05:30
2021-04-17 20:07:23 +05:30
Threads created this way only appear in the original merge request
2018-03-17 18:26:18 +05:30
and not when navigating to that commit under your project's
**Repository > Commits** page.
2021-02-22 17:27:13 +05:30
NOTE:
2019-09-30 21:07:59 +05:30
When a link of a commit reference is found in a thread inside a merge
2021-04-17 20:07:23 +05:30
request, it is automatically converted to a link in the context of the
2018-03-17 18:26:18 +05:30
current merge request.
2019-09-30 21:07:59 +05:30
### Marking a comment or thread as resolved
2017-08-17 22:00:37 +05:30
2021-06-08 01:23:25 +05:30
You can mark a thread as resolved by selecting the **Resolve thread**
2019-09-30 21:07:59 +05:30
button at the bottom of the thread.
2017-08-17 22:00:37 +05:30
2020-10-24 23:57:45 +05:30
!["Resolve thread" button](img/resolve_thread_button_v13_3.png)
2017-08-17 22:00:37 +05:30
Alternatively, you can mark each comment as resolved individually.
2019-09-30 21:07:59 +05:30
!["Resolve comment" button](img/resolve_comment_button.png)
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
### Move all unresolved threads in a merge request to an issue
2017-08-17 22:00:37 +05:30
2021-06-08 01:23:25 +05:30
To continue all open threads from a merge request in a new issue, select
**Resolve all threads in new issue**.
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
![Open new issue for all unresolved threads](img/btn_new_issue_for_all_threads.png)
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
Alternatively, when your project only accepts merge requests [when all threads
are resolved](#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved),
2021-04-17 20:07:23 +05:30
an **open an issue to resolve them later** link displays in the merge
2017-08-17 22:00:37 +05:30
request widget.
2021-03-11 19:13:27 +05:30
![Link in merge request widget](img/resolve_thread_open_issue_v13_9.png)
2017-08-17 22:00:37 +05:30
2021-04-17 20:07:23 +05:30
This prepares an issue with its content referring to the merge request and
2019-09-30 21:07:59 +05:30
the unresolved threads.
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
![Issue mentioning threads in a merge request](img/preview_issue_for_threads.png)
2017-08-17 22:00:37 +05:30
2021-04-29 21:17:54 +05:30
Hitting **Create issue** causes all threads to be marked as resolved and
2017-08-17 22:00:37 +05:30
add a note referring to the newly created issue.
2019-09-30 21:07:59 +05:30
![Mark threads as resolved notice](img/resolve_thread_issue_notice.png)
2017-08-17 22:00:37 +05:30
You can now proceed to merge the merge request from the UI.
2019-09-30 21:07:59 +05:30
### Moving a single thread to a new issue
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
To create a new issue for a single thread, you can use the **Resolve this
thread in a new issue** button.
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
![Create issue for thread](img/new_issue_for_thread.png)
2017-08-17 22:00:37 +05:30
2021-04-17 20:07:23 +05:30
This directs you to a new issue prefilled with the content of the
2019-09-30 21:07:59 +05:30
thread, similar to the issues created for delegating multiple
2021-04-17 20:07:23 +05:30
threads at once. Saving the issue marks the thread as resolved and
2019-09-30 21:07:59 +05:30
add a note to the merge request thread referencing the new issue.
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
![New issue for a single thread](img/preview_issue_for_thread.png)
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
### Only allow merge requests to be merged if all threads are resolved
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
You can prevent merge requests from being merged until all threads are
2017-08-17 22:00:37 +05:30
resolved.
Navigate to your project's settings page, select the
2019-09-30 21:07:59 +05:30
**Only allow merge requests to be merged if all threads are resolved** check
2017-08-17 22:00:37 +05:30
box and hit **Save** for the changes to take effect.
2019-09-30 21:07:59 +05:30
![Only allow merge if all the threads are resolved settings](img/only_allow_merge_if_all_threads_are_resolved.png)
2017-08-17 22:00:37 +05:30
2021-04-17 20:07:23 +05:30
From now on, you can't merge from the UI until all threads
2017-08-17 22:00:37 +05:30
are resolved.
2021-03-11 19:13:27 +05:30
![Only allow merge if all the threads are resolved message](img/resolve_thread_open_issue_v13_9.png)
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
### Automatically resolve merge request diff threads when they become outdated
2018-03-17 18:26:18 +05:30
2019-09-30 21:07:59 +05:30
You can automatically resolve merge request diff threads on lines modified
2018-03-17 18:26:18 +05:30
with a new push.
Navigate to your project's settings page, select the **Automatically resolve
2019-09-30 21:07:59 +05:30
merge request diffs threads on lines changed with a push** check box and hit
2018-03-17 18:26:18 +05:30
**Save** for the changes to take effect.
2019-09-30 21:07:59 +05:30
![Automatically resolve merge request diff threads when they become outdated](img/automatically_resolve_outdated_discussions.png)
2018-03-17 18:26:18 +05:30
2021-04-17 20:07:23 +05:30
From now on, any threads on a diff are resolved by default if a push
2019-09-30 21:07:59 +05:30
makes that diff section outdated. Threads on lines that don't change and
top-level resolvable threads are not automatically resolved.
2018-03-17 18:26:18 +05:30
2019-09-30 21:07:59 +05:30
## Commit threads
2018-03-17 18:26:18 +05:30
2019-09-30 21:07:59 +05:30
You can add comments and threads to a particular commit under your
2018-03-17 18:26:18 +05:30
project's **Repository > Commits**.
2021-02-22 17:27:13 +05:30
WARNING:
2021-04-17 20:07:23 +05:30
Threads created this way are lost if the commit ID changes after a
2018-03-17 18:26:18 +05:30
force push.
2017-08-17 22:00:37 +05:30
## Threaded discussions
2019-09-30 21:07:59 +05:30
While resolvable threads are only available to merge request diffs,
threads can also be added without a diff. You can start a specific
2021-04-17 20:07:23 +05:30
thread which looks like a thread, on issues, commits, snippets, and
2017-08-17 22:00:37 +05:30
merge requests.
2021-04-17 20:07:23 +05:30
To start a threaded discussion, select the **Comment** button toggle dropdown,
select **Start thread**, and then select **Start thread** when you're ready to
2017-08-17 22:00:37 +05:30
post the comment.
![Comment type toggle](img/comment_type_toggle.gif)
2021-04-17 20:07:23 +05:30
This posts a comment with a single thread to allow you to discuss specific
2017-08-17 22:00:37 +05:30
comments in greater detail.
2019-09-30 21:07:59 +05:30
![Thread comment](img/discussion_comment.png)
2017-08-17 22:00:37 +05:30
2019-09-30 21:07:59 +05:30
## Image threads
2018-03-17 18:26:18 +05:30
2019-09-30 21:07:59 +05:30
Sometimes a thread is revolved around an image. With image threads,
you can easily target a specific coordinate of an image and start a thread
around it. Image threads are available in merge requests and commit detail views.
2018-03-17 18:26:18 +05:30
2019-09-30 21:07:59 +05:30
To start an image thread, hover your mouse over the image. Your mouse pointer
2018-03-17 18:26:18 +05:30
should convert into an icon, indicating that the image is available for commenting.
2019-09-30 21:07:59 +05:30
Simply click anywhere on the image to create a new thread.
2018-03-17 18:26:18 +05:30
2019-09-30 21:07:59 +05:30
![Start image thread](img/start_image_discussion.gif)
2018-03-17 18:26:18 +05:30
2021-04-17 20:07:23 +05:30
After you select the image, a comment form is displayed that would be the start
of your thread. After you save your comment, a new badge is displayed on
2019-09-30 21:07:59 +05:30
top of your image. This badge represents your thread.
2018-03-17 18:26:18 +05:30
2021-02-22 17:27:13 +05:30
NOTE:
2019-09-30 21:07:59 +05:30
This thread badge is typically associated with a number that is only used as a visual
reference for each thread. In the merge request thread tab,
2021-04-17 20:07:23 +05:30
this badge is indicated with a comment icon, because each thread renders a new
2018-03-17 18:26:18 +05:30
image section.
2019-09-30 21:07:59 +05:30
Image threads also work on diffs that replace an existing image. In this diff view
mode, you can toggle the different view modes and still see the thread point badges.
2018-03-17 18:26:18 +05:30
2021-04-17 20:07:23 +05:30
| 2-up | Swipe | Onion Skin |
|:-----------:|:----------:|:----------:|
2018-03-17 18:26:18 +05:30
| ![2-up view](img/two_up_view.png) | ![swipe view](img/swipe_view.png) | ![onion skin view](img/onion_skin_view.png) |
2019-09-30 21:07:59 +05:30
Image threads also work well with resolvable threads. Resolved threads
2021-04-17 20:07:23 +05:30
on diffs (not on the merge request discussion tab) appear collapsed on page
load and have a corresponding badge counter to match the counter on the image.
2018-03-17 18:26:18 +05:30
2019-09-30 21:07:59 +05:30
![Image resolved thread](img/image_resolved_discussion.png)
2018-03-17 18:26:18 +05:30
## Lock discussions
2019-09-30 21:07:59 +05:30
For large projects with many contributors, it may be useful to stop threads
2018-03-17 18:26:18 +05:30
in issues or merge requests in these scenarios:
2019-09-30 21:07:59 +05:30
- The project maintainer has already resolved the thread and it is not helpful
for continued feedback.
- The project maintainer has already directed new conversation
2019-07-07 11:18:12 +05:30
to newer issues or merge requests.
2019-09-30 21:07:59 +05:30
- The people participating in the thread are trolling, abusive, or otherwise
2019-07-07 11:18:12 +05:30
being unproductive.
2018-03-17 18:26:18 +05:30
2019-07-07 11:18:12 +05:30
In these cases, a user with Developer permissions or higher in the project can lock (and unlock)
an issue or a merge request, using the "Lock" section in the sidebar. For issues,
a user with Reporter permissions can lock (and unlock).
2018-03-17 18:26:18 +05:30
| Unlock | Lock |
| :-----------: | :----------: |
| ![Turn off discussion lock](img/turn_off_lock.png) | ![Turn on discussion lock](img/turn_on_lock.png) |
System notes indicate locking and unlocking.
![Discussion lock system notes](img/discussion_lock_system_notes.png)
In a locked issue or merge request, only team members can add new comments and
edit existing comments. Non-team members are restricted from adding or editing comments.
| Team member | Non-team member |
| :-----------: | :----------: |
| ![Comment form member](img/lock_form_member.png) | ![Comment form non-member](img/lock_form_non_member.png) |
2021-04-17 20:07:23 +05:30
Additionally, locked issues and merge requests can't be reopened.
2018-11-20 20:47:30 +05:30
2021-03-11 19:13:27 +05:30
## Confidential Comments
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207473) in GitLab 13.9.
2021-04-29 21:17:54 +05:30
> - [Deployed behind a feature flag](../feature_flags.md), disabled by default.
> - Disabled on GitLab.com.
> - Not recommended for production use.
> - To use in GitLab self-managed instances, ask a GitLab administrator to enable it. **(FREE SELF)**
2021-03-11 19:13:27 +05:30
WARNING:
This feature might not be available to you. Check the **version history** note above for details.
2021-04-17 20:07:23 +05:30
When creating a comment, you can make it visible only to the project members (users with Reporter and higher permissions).
2021-03-11 19:13:27 +05:30
2021-04-17 20:07:23 +05:30
To create a confidential comment, select the **Make this comment confidential** check box before you submit it.
2021-03-11 19:13:27 +05:30
![Confidential comments](img/confidential_comments_v13_9.png)
2018-12-13 13:39:08 +05:30
## Filtering notes
2021-04-17 20:07:23 +05:30
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/26723) in GitLab 11.5.
2018-12-13 13:39:08 +05:30
2019-07-07 11:18:12 +05:30
For issues with many comments like activity notes and user comments, sometimes
2019-09-30 21:07:59 +05:30
finding useful information can be hard. There is a way to filter comments from single notes and threads for merge requests and issues.
2018-12-13 13:39:08 +05:30
2019-03-02 22:35:43 +05:30
From a merge request's **Discussion** tab, or from an epic/issue overview, find the filter's dropdown menu on the right side of the page, from which you can choose one of the following options:
2018-12-13 13:39:08 +05:30
- **Show all activity**: displays all user comments and system notes
2019-07-07 11:18:12 +05:30
(issue updates, mentions from other issues, changes to the description, etc).
2018-12-13 13:39:08 +05:30
- **Show comments only**: only displays user comments in the list.
2019-07-07 11:18:12 +05:30
- **Show history only**: only displays activity notes.
2018-12-13 13:39:08 +05:30
![Notes filters dropdown options](img/index_notes_filters.png)
2021-04-17 20:07:23 +05:30
After you select one of the filters in a given issue or merge request, GitLab saves
your preference, so that it persists when you visit the same page again
2018-12-13 13:39:08 +05:30
from any device you're logged into.
2019-09-30 21:07:59 +05:30
## Start a thread by replying to a standard comment
2019-07-07 11:18:12 +05:30
2021-04-17 20:07:23 +05:30
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/30299) in GitLab 11.9
2019-07-07 11:18:12 +05:30
2019-09-30 21:07:59 +05:30
To reply to a standard (non-thread) comment, you can use the **Reply to comment** button.
2019-07-07 11:18:12 +05:30
![Reply to comment button](img/reply_to_comment_button.png)
2019-09-30 21:07:59 +05:30
The **Reply to comment** button is only displayed if you have permissions to reply to an existing thread, or start a thread from a standard comment.
2019-07-07 11:18:12 +05:30
2021-06-08 01:23:25 +05:30
Selecting the **Reply to comment** button brings the reply area into focus and you can type your reply.
2019-07-07 11:18:12 +05:30
![Reply to comment feature](img/reply_to_comment.gif)
2021-04-17 20:07:23 +05:30
Replying to a non-thread comment converts the non-thread comment to a
2021-03-11 19:13:27 +05:30
thread after the reply is submitted. This conversion is considered an edit
2021-04-17 20:07:23 +05:30
to the original comment, so a note about when it was last edited appears underneath it.
2019-07-07 11:18:12 +05:30
2021-04-17 20:07:23 +05:30
This feature exists only for issues, merge requests, and epics. Commits, snippets, and merge request diff threads are
2019-09-30 21:07:59 +05:30
not supported yet.
2020-06-23 00:09:42 +05:30
## Assign an issue to the commenting user
2021-04-17 20:07:23 +05:30
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/191455) in GitLab 13.1.
2020-06-23 00:09:42 +05:30
You can assign an issue to a user who made a comment.
2021-06-08 01:23:25 +05:30
In the comment, select the **More Actions** menu, and then select **Assign to commenting user**.
2020-06-23 00:09:42 +05:30
2021-06-08 01:23:25 +05:30
Select the button again to unassign the commenter.
2020-06-23 00:09:42 +05:30
![Assign to commenting user](img/quickly_assign_commenter_v13_1.png)
2021-03-11 19:13:27 +05:30
## Enable or disable Confidential Comments **(FREE SELF)**
Confidential Comments is under development and not ready for production use. It is
deployed behind a feature flag that is **disabled by default**.
[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
can enable it.
To enable it:
```ruby
Feature.enable(:confidential_notes)
```
To disable it:
```ruby
Feature.disable(:confidential_notes)
```