Add latest changes from gitlab-org/gitlab@master

4 files changed, 9 insertions, 8 deletions

diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 73f1d3752fe..3f90f540c7a 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -158,7 +158,7 @@ GitLab 15.2 to simplify the codebase and prevent any unwanted performance degrad
 
 ### Dependency Scanning default Java version changed to 17
 
-Planned removal: GitLab <span class="removal-milestone">15.0</span> (2021-05-22)
+Planned removal: GitLab <span class="removal-milestone">15.0</span> (2022-05-22)
 
 WARNING:
 This is a [breaking change](https://docs.gitlab.com/ee/development/contributing/#breaking-changes).
@@ -204,7 +204,7 @@ For more information about iteration cadences, you can refer to
 
 ### Outdated indices of Advanced Search migrations
 
-Planned removal: GitLab <span class="removal-milestone">15.0</span> (2021-05-22)
+Planned removal: GitLab <span class="removal-milestone">15.0</span> (2022-05-22)
 
 WARNING:
 This is a [breaking change](https://docs.gitlab.com/ee/development/contributing/#breaking-changes).
@@ -412,7 +412,7 @@ For additional context, or to provide feedback regarding this change, please ref
 
 ### Dependency Scanning Python 3.9 and 3.6 image deprecation
 
-Planned removal: GitLab <span class="removal-milestone">15.0</span> (2021-05-22)
+Planned removal: GitLab <span class="removal-milestone">15.0</span> (2022-05-22)
 
 WARNING:
 This is a [breaking change](https://docs.gitlab.com/ee/development/contributing/#breaking-changes).
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index b4822f48be0..dc8796ffe4d 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -158,7 +158,7 @@ The following table lists project permissions available for each role:
 | [Projects](project/index.md):<br>Edit project badges                                                                                                                                 |          |          |           | ✓          | ✓        |
 | [Projects](project/index.md):<br>Edit project settings                                                                                                                               |          |          |           | ✓          | ✓        |
 | [Projects](project/index.md):<br>Export project                                                                                                                                      |          |          |           | ✓          | ✓        |
-| [Projects](project/index.md):<br>Manage [project access tokens](project/settings/project_access_tokens.md) (*11*)                                                                    |          |          |           | ✓          | ✓        |
+| [Projects](project/index.md):<br>Manage [project access tokens](project/settings/project_access_tokens.md) (*11*)                                                                    |          |          |           | ✓ (*21*)   | ✓        |
 | [Projects](project/index.md):<br>Manage [Project Operations](../operations/index.md)                                                                                                 |          |          |           | ✓          | ✓        |
 | [Projects](project/index.md):<br>Rename project                                                                                                                                      |          |          |           | ✓          | ✓        |
 | [Projects](project/index.md):<br>Share (invite) projects with groups                                                                                                                 |          |          |           | ✓ (*7*)    | ✓ (*7*)  |
@@ -238,7 +238,7 @@ The following table lists project permissions available for each role:
 18. Authors and assignees of issues can modify the title and description even if they don't have the Reporter role.
 19. Authors and assignees can close and reopen issues even if they don't have the Reporter role.
 20. The ability to view the Container Registry and pull images is controlled by the [Container Registry's visibility permissions](packages/container_registry/index.md#container-registry-visibility-permissions).
-21. Maintainers cannot create, demote, or remove Owners, and they cannot promote users to the Owner role.
+21. Maintainers cannot create, demote, or remove Owners, and they cannot promote users to the Owner role. They also cannot approve Owner role access requests.
 
 <!-- markdownlint-enable MD029 -->
 
diff --git a/doc/user/project/integrations/slack.md b/doc/user/project/integrations/slack.md
index 870554100b7..bd93fbcbcbc 100644
--- a/doc/user/project/integrations/slack.md
+++ b/doc/user/project/integrations/slack.md
@@ -91,7 +91,7 @@ the error message and keep troubleshooting from there.
 You might see an entry like the following in your Sidekiq log:
 
 ```plaintext
-2019-01-10_13:22:08.42572 2019-01-10T13:22:08.425Z 6877 TID-abcdefg ProjectServiceWorker JID-3bade5fb3dd47a85db6d78c5 ERROR: {:class=>"ProjectServiceWorker", :service_class=>"SlackService", :message=>"SSL_connect returned=1 errno=0 state=error: certificate verify failed"}
+2019-01-10_13:22:08.42572 2019-01-10T13:22:08.425Z 6877 TID-abcdefg Integrations::ExecuteWorker JID-3bade5fb3dd47a85db6d78c5 ERROR: {:class=>"Integrations::ExecuteWorker :service_class=>"SlackService", :message=>"SSL_connect returned=1 errno=0 state=error: certificate verify failed"}
 ```
 
 This issue occurs when there is a problem with GitLab communicating with Slack,
diff --git a/doc/user/project/members/index.md b/doc/user/project/members/index.md
index 28bd353d8cc..7bea57d180b 100644
--- a/doc/user/project/members/index.md
+++ b/doc/user/project/members/index.md
@@ -225,9 +225,10 @@ GitLab users can request to become a member of a project.
 
 An email is sent to the most recently active project maintainers.
 Up to ten project maintainers are notified.
-Any project maintainer can approve or decline the request.
+Any project owner or maintainer can approve or decline the request.
+Project maintainers cannot approve Owner role access requests.
 
-If a project does not have any maintainers, the notification is sent to the
+If a project does not have any direct owners or maintainers, the notification is sent to the
 most recently active owners of the project's group.
 
 If you change your mind before your request is approved, select