Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

7 files changed, 38 insertions, 55 deletions

diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md
index 5e2908a26e1..18b4e53fb31 100644
--- a/doc/user/profile/account/delete_account.md
+++ b/doc/user/profile/account/delete_account.md
@@ -56,6 +56,7 @@ When deleting users, you can either:
   - Issues.
   - Merge requests.
   - Notes and comments.
+  - Releases.
   - Personal access tokens.
   - Snippets.
 
diff --git a/doc/user/profile/active_sessions.md b/doc/user/profile/active_sessions.md
index 430d1c3dc9f..7a837258cb2 100644
--- a/doc/user/profile/active_sessions.md
+++ b/doc/user/profile/active_sessions.md
@@ -40,7 +40,7 @@ To revoke an active session:
 
 NOTE:
 When any session is revoked all **Remember me** tokens for all
-devices are revoked. See [Why do I keep getting signed out?](index.md#why-do-i-keep-getting-signed-out)
+devices are revoked. See [Why do you keep getting signed out?](index.md#why-do-you-keep-getting-signed-out)
 for more information about the **Remember me** feature.
 
 <!-- ## Troubleshooting
diff --git a/doc/user/profile/contributions_calendar.md b/doc/user/profile/contributions_calendar.md
index 6df7ad56c5e..d66e555970a 100644
--- a/doc/user/profile/contributions_calendar.md
+++ b/doc/user/profile/contributions_calendar.md
@@ -21,50 +21,20 @@ The contribution calendar only displays contributions from the last 12 months, b
 
 GitLab tracks the following contribution events:
 
-- `approved`
-  - Merge request
-- `closed`
-  - [Epic](../group/epics/index.md)
-  - Issue
-  - Merge request
-  - Milestone
-- `commented` on any `Noteable` record.
-  - Alert
-  - Commit
-  - Design
-  - Issue
-  - Merge request
-  - Snippet
-- `created`
-  - Design
-  - [Epic](../group/epics/index.md)
-  - Issue
-  - Merge request
-  - Milestone
-  - Project
-  - Wiki page
-- `destroyed`
-  - Design
-  - Milestone
-  - Wiki page
-- `expired`
-  - Project membership
-- `joined`
-  - Project membership
-- `left`
-  - Project membership
-- `merged`
-  - Merge request
-- `pushed` commits to (or deleted commits from) a repository, individually or in bulk.
-  - Project
-- `reopened`
-  - [Epic](../group/epics/index.md)
-  - Issue
-  - Merge request
-  - Milestone
-- `updated`
-  - Design
-  - Wiki page
+| Event | Contribution |
+| ----- | ------------ |
+| `approved` | Merge request |
+| `closed` | [Epic](../group/epics/index.md), Issue, Merge request, Milestone, Work item |
+| `commented` on any `Noteable` record. | Alert, Commit, Design, Issue, Merge request, Snippet |
+| `created` | Design, Epic, Issue, Merge request, Milestone, Project, Wiki page, Work item |
+| `destroyed` | Design, Milestone, Wiki page |
+| `expired` | Project membership |
+| `joined` | Project membership |
+| `left` | Project membership |
+| `merged` | Merge request |
+| `pushed` commits to (or deleted commits from) a repository, individually or in bulk. | Project |
+| `reopened` | Epic, Issue, Merge request, Milestone |
+| `updated` | Design, Wiki page |
 
 ### View daily contributions
 
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 4adf6c351df..d6c5bd6c108 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -328,7 +328,7 @@ To view a user's activity in a top-level Activity view:
 
 ## Troubleshooting
 
-### Why do I keep getting signed out?
+### Why do you keep getting signed out?
 
 When you sign in to the main GitLab application, a `_gitlab_session` cookie is
 set. When you close your browser, the cookie is cleared client-side
@@ -368,7 +368,7 @@ GitLab uses both session and persistent cookies:
 
 - Session cookie: Session cookies are normally removed at the end of the browser session when
   the browser is closed. The `_gitlab_session` cookie has no fixed expiration date. However,
-  it expires based on its [`session_expire_delay`](#why-do-i-keep-getting-signed-out).
+  it expires based on its [`session_expire_delay`](#why-do-you-keep-getting-signed-out).
 - Persistent cookie: The `remember_user_token` is a cookie with an expiration date of two weeks.
   GitLab activates this cookie if you select **Remember Me** when you sign in.
 
diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md
index 1deb4842107..d0a420a4bbd 100644
--- a/doc/user/profile/notifications.md
+++ b/doc/user/profile/notifications.md
@@ -76,7 +76,7 @@ For each project and group you can select one of the following levels:
 | Participate | Receive notifications for threads you have participated in. |
 | On mention  | Receive notifications when you are [mentioned](../discussions/index.md#mentions) in a comment. |
 | Disabled    | Receive no notifications.                                   |
-| Custom      | Receive notifications for selected events.                  |
+| Custom      | Receive notifications for selected events and threads you have participated in.                  |
 
 ### Global notification settings
 
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index dce8684d993..664d22959a2 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -96,7 +96,7 @@ A diff compares the old/removed content with the new/added content (for example,
 [Markdown inline diff](../markdown.md#inline-diff)).
 Typically, the colors red and green are used for removed and added lines in diffs.
 The exact colors depend on the selected [syntax highlighting theme](#syntax-highlighting-theme).
-The colors may lead to difficulties in case of red–green color blindness.
+The colors may lead to difficulties in case of red-green color blindness.
 
 For this reason, you can customize the following colors:
 
@@ -203,6 +203,22 @@ NOTE:
 This feature is experimental, and choosing absolute times might break certain layouts.
 Open an issue if you notice that using absolute times breaks a layout.
 
+## Web IDE
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/370139) in GitLab 15.7 [with a flag](../../administration/feature_flags.md) named `vscode_web_ide`. Disabled by default.
+
+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 `vscode_web_ide`. On GitLab.com, this feature is available.
+
+The [Web IDE Beta](../project/web_ide_beta/index.md) is
+the default editing environment when the `vscode_web_ide` feature
+flag is enabled.
+
+To stop using the Web IDE Beta:
+
+1. In the **Web IDE** section, select the **Opt out of the Web IDE Beta** checkbox.
+1. Select **Save changes**.
+
 ## Integrations
 
 Configure your preferences with third-party services which provide enhancements to your GitLab experience.
diff --git a/doc/user/profile/user_passwords.md b/doc/user/profile/user_passwords.md
index b8dbdcdd956..9c1ba8852d2 100644
--- a/doc/user/profile/user_passwords.md
+++ b/doc/user/profile/user_passwords.md
@@ -61,12 +61,8 @@ Self-managed installations can configure the following additional password requi
 ## Block weak passwords
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23610) in GitLab 15.4 [with a flag](../../administration/feature_flags.md) named `block_weak_passwords`, weak passwords aren't accepted. Disabled by default on self-managed.
-> - [Enabled](https://gitlab.com/gitlab-org/gitlab/-/issues/363445) on GitLab.com.
-
-FLAG:
-On self-managed GitLab, by default blocking weak passwords is not available. To make it available, ask an administrator
-to [enable the feature flag](../../administration/feature_flags.md) named `block_weak_passwords`. On GitLab.com, this
-feature is available but can be configured by GitLab.com administrators only.
+> - [Enabled](https://gitlab.com/gitlab-org/gitlab/-/issues/363445) on GitLab.com in GitLab 15.6.
+> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/363445) and enabled on self-managed in GitLab 15.7. Feature flag `block_weak_passwords` removed.
 
 GitLab disallows weak passwords. Your password is considered weak when it: