Add functionality to collapse outdated diff comments regardless of discussion resolution

2 files changed, 13 insertions, 0 deletions

diff --git a/doc/user/discussions/img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png b/doc/user/discussions/img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png
new file mode 100644
index 00000000000..4c273637bfc
--- /dev/null
+++ b/doc/user/discussions/img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index 8b1d299484c..5771b420fdf 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -116,6 +116,19 @@ are resolved.
 
 ![Only allow merge if all the discussions are resolved message](img/only_allow_merge_if_all_discussions_are_resolved_msg.png)
 
+### Automatically collapse outdated diff comments regardless of discussion resolution
+
+You can automatically collapse comments on outdated diffs regardless of whether
+the discussion is resolved.
+
+Navigate to your project's settings page, select the
+**Collapse outdated diffs regardless of discussion resolution** check box and hit
+**Save** for the changes to take effect.
+
+![Automatically collapse outdated diff comments regardless of discussion resolution](img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png)
+
+From now on, any discussions on an outdated diff will be collapsed by default. 
+
 ## Threaded discussions
 
 > [Introduced][ce-7527] in GitLab 9.1.