summaryrefslogtreecommitdiff
path: root/doc/user/discussions
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2019-05-06 12:56:48 -0500
committerPaul Slaughter <pslaughter@gitlab.com>2019-05-07 00:00:40 -0500
commitd24d77a93a64e4698163c5ca579954f61ad9248a (patch)
tree36f10fd7ad3fd1949e473cbe485cc8971b0d8e45 /doc/user/discussions
parentdfe59c75bf4d6f6937767ee9ef35df4ef42e7667 (diff)
downloadgitlab-ce-d24d77a93a64e4698163c5ca579954f61ad9248a.tar.gz
Resolve discussion when suggestion is applied54405-resolve-discussion-when-applying-a-suggested-change
- Adds color and a tooltip to describe this new behavior - Does not resolve if discussion is already resolved - Adds an action `resolveDiscussion` to simplify `toggleResolveNote` - Updates docs https://gitlab.com/gitlab-org/gitlab-ce/issues/54405
Diffstat (limited to 'doc/user/discussions')
-rw-r--r--doc/user/discussions/index.md9
1 files changed, 3 insertions, 6 deletions
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index 248f8395db1..9c29265847e 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -401,13 +401,10 @@ the Merge Request authored by the user that applied them.
![Apply suggestions](img/suggestion.png)
- > **Note:**
- Discussions are _not_ automatically resolved. Will be introduced by
- [#54405](https://gitlab.com/gitlab-org/gitlab-ce/issues/54405).
-
Once the author applies a suggestion, it will be marked with the **Applied** label,
-and GitLab will create a new commit with the message `Apply suggestion to <file-name>`
-and push the suggested change directly into the codebase in the merge request's branch.
+the discussion will be automatically resolved, and GitLab will create a new commit
+with the message `Apply suggestion to <file-name>` and push the suggested change
+directly into the codebase in the merge request's branch.
[Developer permission](../permissions.md) is required to do so.
> **Note:**