Add latest changes from gitlab-org/gitlab@master

6 files changed, 32 insertions, 4 deletions

diff --git a/doc/administration/server_hooks.md b/doc/administration/server_hooks.md
index f3d5acb312d..5e9863447a1 100644
--- a/doc/administration/server_hooks.md
+++ b/doc/administration/server_hooks.md
@@ -150,16 +150,33 @@ To create a global server hook for all repositories:
 If the server hook code is properly implemented, it should execute when the Git hook is next triggered. Hooks are executed in alphabetical order by filename in the hook type
 subdirectories.
 
-## Remove server hooks for a repository using Gitaly CLI
+## Remove server hooks for a repository
+
+::Tabs
+
+:::TabTitle GitLab 15.11 and later
 
 > [Introduced](https://gitlab.com/gitlab-org/gitaly/-/issues/4629) in GitLab 15.11, `hooks set` command replaces direct file system access.
 
-To remove hooks using the Gitaly CLI, pass an empty tarball to `hook set` to indicate that the repository should contain no hooks. For example:
+Prerequisites:
+
+- The [storage name and relative path](repository_storage_types.md#from-project-name-to-hashed-path) for the repository.
+
+To remove server hooks, pass an empty tarball to `hook set` to indicate that the repository should contain no hooks. For example:
 
 ```shell
 cat empty_hooks.tar | gitaly hooks set --storage <storage> --repository <relative path> --config <config path>`.
 ```
 
+:::TabTitle GitLab 15.10 and earlier
+
+To remove server hooks:
+
+1. Go to the location of the repository on disk.
+1. Delete the server hooks in the `custom_hooks` directory.
+
+::EndTabs
+
 ## Chained server hooks
 
 GitLab can execute server hooks in a chain. GitLab searches for and executes server hooks in the following order:
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index 52a39fb3f49..37d12948809 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -75,6 +75,7 @@ billable user, with the following exceptions:
     - [Support Bot](../../user/project/service_desk.md#support-bot-user).
     - [Bot users for projects](../../user/project/settings/project_access_tokens.md#bot-users-for-projects).
     - [Bot users for groups](../../user/group/settings/group_access_tokens.md#bot-users-for-groups).
+    - Other [internal users](../../development/internal_users.md#internal-users).
 
 **Billable users** as reported in the `/admin` section is updated once per day.
 
diff --git a/doc/tutorials/index.md b/doc/tutorials/index.md
index 6e185bd2a88..fe295d13c09 100644
--- a/doc/tutorials/index.md
+++ b/doc/tutorials/index.md
@@ -80,13 +80,14 @@ Use GitLab Pages to publish a static website directly from your project.
 | [Create a Pages website from a CI/CD template](../user/project/pages/getting_started/pages_ci_cd_template.md) | Quickly generate a Pages website for your project using a CI/CD template for a popular Static Site Generator (SSG). | **{star}** |
 | [Create a Pages website from scratch](../user/project/pages/getting_started/pages_from_scratch.md) | Create all the components of a Pages website from a blank project. | |
 
-## Secure your application
+## Secure your application and check compliance
 
-GitLab can check your application for security vulnerabilities.
+GitLab can check your application for security vulnerabilities and that it meets compliance requirements.
 
 | Topic | Description | Good for beginners |
 |-------|-------------|--------------------|
 | [Set up dependency scanning](https://about.gitlab.com/blog/2021/01/14/try-dependency-scanning/) | Try out dependency scanning, which checks for known vulnerabilities in dependencies. | **{star}** |
+| [Create a compliance pipeline](create_compliance_pipeline.md) | Learn how to create compliance pipelines for your groups. | **{star}** |
 | [Get started with GitLab application security](../user/application_security/get-started-security.md) | Follow recommended steps to set up security tools. | |
 | [GitLab Security Essentials](https://levelup.gitlab.com/courses/security-essentials) | Learn about the essential security capabilities of GitLab in this self-paced course. | |
 
diff --git a/doc/user/application_security/vulnerability_report/index.md b/doc/user/application_security/vulnerability_report/index.md
index 3d7565f97bc..a4c4737f767 100644
--- a/doc/user/application_security/vulnerability_report/index.md
+++ b/doc/user/application_security/vulnerability_report/index.md
@@ -19,6 +19,9 @@ At all levels, the Vulnerability Report contains:
 - Filters for common vulnerability attributes.
 - Details of each vulnerability, presented in tabular layout.
 
+<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
+For an overview, see [Vulnerability Management](https://www.youtube.com/watch?v=8SJHz6BCgXM).
+
 The **Activity** column contains icons to indicate the activity, if any, taken on the vulnerability
 in that row:
 
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index d35a0920cf2..fc904ed5779 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -20,6 +20,9 @@ For larger organizations, you can also create [subgroups](subgroups/index.md).
 
 For more information about creating and managing your groups, see [Manage groups](manage.md).
 
+NOTE:
+Self-managed customers should create a top-level group so you can see an overview of your organization. We are working on creating an [organization view](https://gitlab.com/groups/gitlab-org/-/epics/9266), so you can see all groups.
+
 ## Group visibility
 
 Like projects, a group can be configured to limit the visibility of it to:
diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md
index d0eb7e4b7a0..eadcf67dabe 100644
--- a/doc/user/group/manage.md
+++ b/doc/user/group/manage.md
@@ -8,6 +8,9 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 Use groups to manage one or more related projects at the same time.
 
+NOTE:
+Self-managed customers should create a top-level group so you can see an overview of your organization. We are working on creating an [organization view](https://gitlab.com/groups/gitlab-org/-/epics/9266), so you can see all groups.
+
 ## View groups
 
 To view groups, on the top bar, select **Main menu > Groups > View all groups**.