Add latest changes from gitlab-org/gitlab@13-3-stable-ee

4 files changed, 15 insertions, 9 deletions

diff --git a/doc/user/discussions/img/quickly_assign_commenter_v13_1.png b/doc/user/discussions/img/quickly_assign_commenter_v13_1.png
index e19a3ed4f75..7f8ce62fe88 100644
--- a/doc/user/discussions/img/quickly_assign_commenter_v13_1.png
+++ b/doc/user/discussions/img/quickly_assign_commenter_v13_1.png
diff --git a/doc/user/discussions/img/resolve_thread_button.png b/doc/user/discussions/img/resolve_thread_button.png
deleted file mode 100644
index ca0a3e50550..00000000000
--- a/doc/user/discussions/img/resolve_thread_button.png
+++ /dev/null
diff --git a/doc/user/discussions/img/resolve_thread_button_v13_3.png b/doc/user/discussions/img/resolve_thread_button_v13_3.png
new file mode 100644
index 00000000000..1d7b10ce25d
--- /dev/null
+++ b/doc/user/discussions/img/resolve_thread_button_v13_3.png
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index 599f46b2c40..f39d0d6c217 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -1,7 +1,8 @@
 ---
-stage: Plan
-group: Project Management
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+stage: Create
+group: Source Code
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers"
+type: reference, howto
 ---
 
 # Threads
@@ -89,15 +90,20 @@ When a link of a commit reference is found in a thread inside a merge
 request, it will be automatically converted to a link in the context of the
 current merge request.
 
-### Jumping between unresolved threads
+### Jumping between unresolved threads (deprecated)
+
+> - [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/199718) in GitLab 13.3.
+> - This button's removal is behind a feature flag enabled by default.
+> - For GitLab self-managed instances, GitLab administrators with access to the
+  [GitLab Rails console](../../administration/feature_flags.md) can opt to disable it by running
+  `Feature.disable(:hide_jump_to_next_unresolved_in_threads)` (for the instance) or
+  `Feature.disable(:hide_jump_to_next_unresolved_in_threads, Project.find(<project id>))`
+  (per project.) **(CORE ONLY)**
 
 When a merge request has a large number of comments it can be difficult to track
 what remains unresolved. You can jump between unresolved threads with the
 Jump button next to the Reply field on a thread.
 
-You can also jump to the next unresolved thread from the button next to the
-resolved threads tracker.
-
 You can also use keyboard shortcuts to navigate among threads:
 
 - Use <kbd>n</kbd> to jump to the next unresolved thread.
@@ -110,7 +116,7 @@ You can also use keyboard shortcuts to navigate among threads:
 You can mark a thread as resolved by clicking the **Resolve thread**
 button at the bottom of the thread.
 
-!["Resolve thread" button](img/resolve_thread_button.png)
+!["Resolve thread" button](img/resolve_thread_button_v13_3.png)
 
 Alternatively, you can mark each comment as resolved individually.
 
@@ -242,7 +248,7 @@ After you click on the image, a comment form will be displayed that would be the
 of your thread. Once you save your comment, you will see a new badge displayed on
 top of your image. This badge represents your thread.
 
->**Note:**
+NOTE: **Note:**
 This thread badge is typically associated with a number that is only used as a visual
 reference for each thread. In the merge request thread tab,
 this badge will be indicated with a comment icon since each thread will render a new