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

Brought create topics to the top of Comments page

parent fdb8426a
...@@ -164,7 +164,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitla ...@@ -164,7 +164,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitla
### Add note to existing issue thread ### Add note to existing issue thread
Adds a new note to the thread. This can also [create a thread from a single comment](../user/discussions/#start-a-thread-by-replying-to-a-standard-comment). Adds a new note to the thread. This can also [create a thread from a single comment](../user/discussions/#create-a-thread-by-replying-to-a-standard-comment).
**WARNING** **WARNING**
Notes can be added to other items than comments, such as system notes, making them threads. Notes can be added to other items than comments, such as system notes, making them threads.
...@@ -581,7 +581,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitla ...@@ -581,7 +581,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitla
### Add note to existing epic thread ### Add note to existing epic thread
Adds a new note to the thread. This can also Adds a new note to the thread. This can also
[create a thread from a single comment](../user/discussions/#start-a-thread-by-replying-to-a-standard-comment). [create a thread from a single comment](../user/discussions/#create-a-thread-by-replying-to-a-standard-comment).
```plaintext ```plaintext
POST /groups/:id/epics/:epic_id/discussions/:discussion_id/notes POST /groups/:id/epics/:epic_id/discussions/:discussion_id/notes
...@@ -966,7 +966,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab ...@@ -966,7 +966,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab
### Add note to existing merge request thread ### Add note to existing merge request thread
Adds a new note to the thread. This can also Adds a new note to the thread. This can also
[create a thread from a single comment](../user/discussions/#start-a-thread-by-replying-to-a-standard-comment). [create a thread from a single comment](../user/discussions/#create-a-thread-by-replying-to-a-standard-comment).
```plaintext ```plaintext
POST /projects/:id/merge_requests/:merge_request_iid/discussions/:discussion_id/notes POST /projects/:id/merge_requests/:merge_request_iid/discussions/:discussion_id/notes
......
...@@ -34,6 +34,50 @@ You can create comments in places like: ...@@ -34,6 +34,50 @@ You can create comments in places like:
Each object can have as many as 5,000 comments. Each object can have as many as 5,000 comments.
## Create a thread by replying to a standard comment
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/30299) in GitLab 11.9.
When you reply to a standard comment, you create a thread.
Prerequisites:
- You must have at least the [Guest role](../permissions.md#project-members-permissions).
- You must be in an issue, merge request, or epic. Commits and snippets threads are not supported.
To create a thread by replying to a comment:
1. On the top right of the comment, select **{comment}** (**Reply to comment**).
![Reply to comment button](img/reply_to_comment_button.png)
The reply area is displayed.
1. Type your reply.
1. Select **Comment** or **Add comment now** (depending on where in the UI you are replying).
The top comment is converted to a thread.
## Create a thread without replying to a comment
You can create a thread without replying to a standard comment.
Prerequisites:
- You must have at least the [Guest role](../permissions.md#project-members-permissions).
- You must be in an issue, commit, snippet, or merge request.
To create a thread:
1. Type a comment.
1. Below the comment, to the right of the **Comment** button, select the down arrow (**{chevron-down}**).
1. From the list, select **Start thread**.
1. Select **Start thread** again.
A threaded comment is created.
![Thread comment](img/discussion_comment.png)
## Reply to a comment by sending email ## Reply to a comment by sending email
If you have ["reply by email"](../../administration/reply_by_email.md) configured, If you have ["reply by email"](../../administration/reply_by_email.md) configured,
...@@ -61,7 +105,7 @@ Thread resolution helps keep track of progress during planning or code review. ...@@ -61,7 +105,7 @@ Thread resolution helps keep track of progress during planning or code review.
Every thread in merge requests, commits, commit diffs, and Every thread in merge requests, commits, commit diffs, and
snippets is initially displayed as unresolved. They can then be individually resolved by anyone 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. with at least the Developer role to the project or by the author of the change being reviewed.
If the thread has been resolved and a non-member un-resolves their own response, If the thread has been resolved and a non-member un-resolves their own response,
this also unresolves the discussion thread. this also unresolves the discussion thread.
If the non-member then resolves this same response, this resolves the discussion thread. If the non-member then resolves this same response, this resolves the discussion thread.
...@@ -188,33 +232,19 @@ From now on, any threads on a diff are resolved by default if a push ...@@ -188,33 +232,19 @@ From now on, any threads on a diff are resolved by default if a push
makes that diff section outdated. Threads on lines that don't change and makes that diff section outdated. Threads on lines that don't change and
top-level resolvable threads are not automatically resolved. top-level resolvable threads are not automatically resolved.
## Commit threads ## Add a comment to a commit
You can add comments and threads to a particular commit.
You can add comments and threads to a particular commit under your 1. On the top bar, select **Menu > Projects** and find your project.
project's **Repository > Commits**. 1. On the left sidebar, select **Repository > Commits**.
1. Below the commits, in the **Comment** field, enter a comment.
1. Select **Comment** or select the down arrow (**{chevron-down}**) to select **Start thread**.
WARNING: WARNING:
Threads created this way are lost if the commit ID changes after a Threads created this way are lost if the commit ID changes after a
force push. force push.
## Threaded discussions
While resolvable threads are only available to merge request diffs,
threads can also be added without a diff. You can start a specific
thread which looks like a thread, on issues, commits, snippets, and
merge requests.
To start a threaded discussion, select the **Comment** button toggle dropdown,
select **Start thread**, and then select **Start thread** when you're ready to
post the comment.
![Comment type toggle](img/comment_type_toggle.gif)
This posts a comment with a single thread to allow you to discuss specific
comments in greater detail.
![Thread comment](img/discussion_comment.png)
## Image threads ## Image threads
Sometimes a thread is revolved around an image. With image threads, Sometimes a thread is revolved around an image. With image threads,
...@@ -320,27 +350,6 @@ After you select one of the filters in a given issue or merge request, GitLab sa ...@@ -320,27 +350,6 @@ After you select one of the filters in a given issue or merge request, GitLab sa
your preference, so that it persists when you visit the same page again your preference, so that it persists when you visit the same page again
from any device you're logged into. from any device you're logged into.
## Start a thread by replying to a standard comment
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/30299) in GitLab 11.9
To reply to a standard (non-thread) comment, you can use the **Reply to comment** button.
![Reply to comment button](img/reply_to_comment_button.png)
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.
Selecting the **Reply to comment** button brings the reply area into focus and you can type your reply.
![Reply to comment feature](img/reply_to_comment.gif)
Replying to a non-thread comment converts the non-thread comment to a
thread after the reply is submitted. This conversion is considered an edit
to the original comment, so a note about when it was last edited appears underneath it.
This feature exists only for issues, merge requests, and epics. Commits, snippets, and merge request diff threads are
not supported yet.
## Assign an issue to the commenting user ## Assign an issue to the commenting user
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/191455) in GitLab 13.1. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/191455) in GitLab 13.1.
......
...@@ -288,7 +288,7 @@ supports [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown). ...@@ -288,7 +288,7 @@ supports [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown).
After you write a comment, you can: After you write a comment, you can:
- Click **Comment** to publish your comment. - Click **Comment** to publish your comment.
- Choose **Start thread** from the dropdown list and start a new [thread](../../discussions/index.md#threaded-discussions) - Choose **Start thread** from the dropdown list and start a new [thread](../../discussions/index.md#create-a-thread-without-replying-to-a-comment)
in that issue's main thread to discuss specific points. This invites other participants in that issue's main thread to discuss specific points. This invites other participants
to reply directly to your thread, keeping related comments grouped together. to reply directly to your thread, keeping related comments grouped together.
......
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