Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

7 files changed, 26 insertions, 22 deletions

diff --git a/doc/user/discussions/img/add_internal_note_v15_0.png b/doc/user/discussions/img/add_internal_note_v15_0.png
new file mode 100644
index 00000000000..cf052edd5e7
--- /dev/null
+++ b/doc/user/discussions/img/add_internal_note_v15_0.png
diff --git a/doc/user/discussions/img/confidential_comments_v13_9.png b/doc/user/discussions/img/confidential_comments_v13_9.png
deleted file mode 100644
index b5be5a622a9..00000000000
--- a/doc/user/discussions/img/confidential_comments_v13_9.png
+++ /dev/null
diff --git a/doc/user/discussions/img/create-new-issue_v14_3.png b/doc/user/discussions/img/create-new-issue_v14_3.png
deleted file mode 100644
index d76fed6cb42..00000000000
--- a/doc/user/discussions/img/create-new-issue_v14_3.png
+++ /dev/null
diff --git a/doc/user/discussions/img/create-new-issue_v15.png b/doc/user/discussions/img/create-new-issue_v15.png
new file mode 100644
index 00000000000..779196b6ba4
--- /dev/null
+++ b/doc/user/discussions/img/create-new-issue_v15.png
diff --git a/doc/user/discussions/img/unresolved_threads_v14_1.png b/doc/user/discussions/img/unresolved_threads_v14_1.png
deleted file mode 100644
index 806dfdc995c..00000000000
--- a/doc/user/discussions/img/unresolved_threads_v14_1.png
+++ /dev/null
diff --git a/doc/user/discussions/img/unresolved_threads_v15.png b/doc/user/discussions/img/unresolved_threads_v15.png
new file mode 100644
index 00000000000..113af20effc
--- /dev/null
+++ b/doc/user/discussions/img/unresolved_threads_v15.png
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index 8537856ef25..97c3d5f1058 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -150,42 +150,45 @@ Notes are added to the page details.
 
 If an issue or merge request is locked and closed, you cannot reopen it.
 
-## Mark a comment as confidential **(FREE SELF)**
+## Add an internal note
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207473) in GitLab 13.9 [with a flag](../../administration/feature_flags.md) named `confidential_notes`. Disabled by default.
 > - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/351143) in GitLab 14.10: you can only mark comments in issues and epics as confidential. Previously, it was also possible for comments in merge requests and snippets.
+> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87403) from "confidential comments" to "internal notes" in GitLab 15.0.
+> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87383) in GitLab 15.0.
 
 FLAG:
-On self-managed GitLab, by default this feature is not available. To make it available,
-ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `confidential_notes`.
-On GitLab.com, this feature is not available.
-You should not use this feature for production environments.
+On self-managed GitLab, by default this feature is available. To hide the feature,
+ask an administrator to [disable the feature flag](../../administration/feature_flags.md) named `confidential_notes`.
+On GitLab.com, this feature is available.
 
-You can make a comment **in an issue or an epic** confidential, so that it is visible only to you (the commenting user) and
-the project members who have at least the Reporter role.
+You can add an internal note **to an issue or an epic**. It's then visible only to the following people:
+
+- Project members who have at least the Reporter role
+- Issue or epic author
+- Users assigned to the issue or epic
 
 Keep in mind:
 
-- You can only mark comments as confidential when you create them.
-- You can't change the confidentiality of existing comments.
-- Replies to comments use same confidentiality as the original comment.
+- Replies to internal notes are also internal.
+- You can not turn an internal note into a regular comment.
 
 Prerequisites:
 
 - You must either:
   - Have at least the Reporter role for the project.
-  - Be the issue assignee.
-  - Be the issue author.
+  - Be the issue or epic assignee.
+  - Be the issue or epic author.
 
-To mark a comment as confidential:
+To add an internal note:
 
 1. Start adding a new comment.
-1. Below the comment, select the **Make this comment confidential** checkbox.
-1. Select **Comment**.
+1. Below the comment, select the **Make this an internal note** checkbox.
+1. Select **Add internal note**.
 
-![Confidential comments](img/confidential_comments_v13_9.png)
+![Internal notes](img/add_internal_note_v15_0.png)
 
-You can also make an [entire issue confidential](../project/issues/confidential_issues.md).
+You can also mark an [issue as confidential](../project/issues/confidential_issues.md).
 
 ## Show only comments
 
@@ -300,7 +303,7 @@ To resolve a thread:
 
 At the top of the page, the number of unresolved threads is updated:
 
-![Count of unresolved threads](img/unresolved_threads_v14_1.png)
+![Count of unresolved threads](img/unresolved_threads_v15.png)
 
 ### Move all unresolved threads in a merge request to an issue
 
@@ -308,7 +311,7 @@ If you have multiple unresolved threads in a merge request, you can
 create an issue to resolve them separately. In the merge request, at the top of the page,
 select **Create issue to resolve all threads** (**{issue-new}**):
 
-![Open new issue for all unresolved threads](img/create-new-issue_v14_3.png)
+![Open new issue for all unresolved threads](img/create-new-issue_v15.png)
 
 All threads are marked as resolved, and a link is added from the merge request to
 the newly created issue.
@@ -327,12 +330,13 @@ the newly created issue.
 ### Prevent merge unless all threads are resolved
 
 You can prevent merge requests from being merged until all threads are
-resolved.
+resolved. When this setting is enabled, the **Unresolved threads** counter in a merge request
+is shown in orange when at least one thread remains unresolved.
 
 1. On the top bar, select **Menu > Projects** and find your project.
 1. On the left sidebar, select **Settings > General**.
 1. Expand **Merge requests**.
-1. Under **Merge checks**, select the **All discussions must be resolved** checkbox.
+1. Under **Merge checks**, select the **All threads must be resolved** checkbox.
 1. Select **Save changes**.
 
 ### Automatically resolve threads in a merge request when they become outdated
@@ -344,7 +348,7 @@ with a new push.
 1. On the left sidebar, select **Settings > General**.
 1. Expand **Merge requests**.
 1. Under **Merge options**, select the
-   **Automatically resolve merge request diff discussions when they become outdated** checkbox.
+   **Automatically resolve merge request diff threads when they become outdated** checkbox.
 1. Select **Save changes**.
 
 Threads are now resolved if a push makes a diff section outdated.