summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-05-07 15:26:42 +0000
committerPhil Hughes <me@iamphill.com>2019-05-07 15:26:42 +0000
commit91acefb1f4ee4f747d4679d9c395a8c8dc33d6de (patch)
tree3ad8e6f5d0237539b51246cdda1e7c9cffa8ccb0 /doc
parent3e6e02a1d771d25d90da187ba414a434807a5b51 (diff)
parentd24d77a93a64e4698163c5ca579954f61ad9248a (diff)
downloadgitlab-ce-91acefb1f4ee4f747d4679d9c395a8c8dc33d6de.tar.gz
Merge branch '54405-resolve-discussion-when-applying-a-suggested-change' into 'master'
Resolve "Resolve discussion when suggestion is applied" Closes #54405 See merge request gitlab-org/gitlab-ce!28160
Diffstat (limited to 'doc')
-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 9327865c682..5d69efc3600 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -396,13 +396,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:**