Commit b63c7931 authored by Suzanne Selhorn's avatar Suzanne Selhorn Committed by Marcin Sedlak-Jakubowski

Removed images and made topic a task

parent d08a7907
...@@ -65,7 +65,7 @@ You can create a thread without replying to a standard comment. ...@@ -65,7 +65,7 @@ You can create a thread without replying to a standard comment.
Prerequisites: Prerequisites:
- You must have at least the [Guest role](../permissions.md#project-members-permissions). - You must have at least the [Guest role](../permissions.md#project-members-permissions).
- You must be in an issue, commit, snippet, or merge request. - You must be in an issue, merge request, commit, or snippet.
To create a thread: To create a thread:
...@@ -95,25 +95,30 @@ You can edit your own comment at any time. ...@@ -95,25 +95,30 @@ You can edit your own comment at any time.
Anyone with the [Maintainer role](../permissions.md) or Anyone with the [Maintainer role](../permissions.md) or
higher can also edit a comment made by someone else. higher can also edit a comment made by someone else.
## Resolvable comments and threads ## Resolve a thread
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5022) in GitLab 8.11. > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5022) in GitLab 8.11.
> - Resolvable threads can be added only to merge request diffs. > - Resolvable threads can be added only to merge request diffs.
> - Resolving comments individually was [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/28750) in GitLab 13.6. > - Resolving comments individually was [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/28750) in GitLab 13.6.
Thread resolution helps keep track of progress during planning or code review. You can resolve a thread when you want to finish a conversation.
Every thread in merge requests, commits, commit diffs, and Prerequisites:
snippets is initially displayed as unresolved. They can then be individually resolved by anyone
with at least the Developer role to the project or by the author of the change being reviewed. - You must have at least the [Developer role](../permissions.md#project-members-permissions)
If the thread has been resolved and a non-member un-resolves their own response, or be the author of the change being reviewed.
this also unresolves the discussion thread. - You must be in an issue, merge request, commit, or snippet.
If the non-member then resolves this same response, this resolves the discussion thread.
To resolve a thread:
1. Go to the thread.
1. Below the last reply, in the **Reply** field, either:
- Select **Resolve thread**.
- Enter text, select the **Resolve thread** checkbox, and select **Add comment now**.
The need to resolve threads prevents you from forgetting to address feedback and lets you At the top of the page, the number of unresolved threads is updated.
hide threads that are no longer relevant.
!["A thread between two people on a piece of code"](img/thread_view.png) ![Count of unresolved threads](img/unresolved_threads_v14_1.png)
### Commit threads in the context of a merge request ### Commit threads in the context of a merge request
......
...@@ -136,7 +136,7 @@ merge requests, code snippets, and commits. ...@@ -136,7 +136,7 @@ merge requests, code snippets, and commits.
When performing inline reviews to implementations When performing inline reviews to implementations
to your codebase through merge requests you can to your codebase through merge requests you can
gather feedback through [resolvable threads](discussions/index.md#resolvable-comments-and-threads). gather feedback through [resolvable threads](discussions/index.md#resolve-a-thread).
### GitLab Flavored Markdown (GFM) ### GitLab Flavored Markdown (GFM)
......
...@@ -27,7 +27,7 @@ important parts of the merge request: ...@@ -27,7 +27,7 @@ important parts of the merge request:
![Merge request tab positions](img/merge_request_tab_position_v13_11.png) ![Merge request tab positions](img/merge_request_tab_position_v13_11.png)
- **Overview**: Contains the description, notifications from pipelines, and a - **Overview**: Contains the description, notifications from pipelines, and a
discussion area for [comment threads](../../discussions/index.md#resolvable-comments-and-threads) discussion area for [comment threads](../../discussions/index.md#resolve-a-thread))
and [code suggestions](reviews/suggestions.md). The right sidebar provides fields and [code suggestions](reviews/suggestions.md). The right sidebar provides fields
to add assignees, reviewers, labels, and a milestone to your work, and the to add assignees, reviewers, labels, and a milestone to your work, and the
[merge request widgets area](widgets.md) reports results from pipelines and tests. [merge request widgets area](widgets.md) reports results from pipelines and tests.
......
...@@ -100,7 +100,7 @@ When you submit your review, GitLab: ...@@ -100,7 +100,7 @@ When you submit your review, GitLab:
### Resolving/Unresolving threads ### Resolving/Unresolving threads
Review comments can also resolve or unresolve [resolvable threads](../../../discussions/index.md#resolvable-comments-and-threads). Review comments can also resolve or unresolve [resolvable threads](../../../discussions/index.md#resolve-a-thread)).
When replying to a comment, a checkbox is displayed to resolve or unresolve When replying to a comment, a checkbox is displayed to resolve or unresolve
the thread after publication. the thread after publication.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment