Add latest changes from gitlab-org/gitlab@master

11 files changed, 46 insertions, 20 deletions

diff --git a/doc/user/admin_area/settings/visibility_and_access_controls.md b/doc/user/admin_area/settings/visibility_and_access_controls.md
index 94de1001e97..5ca942a42bb 100644
--- a/doc/user/admin_area/settings/visibility_and_access_controls.md
+++ b/doc/user/admin_area/settings/visibility_and_access_controls.md
@@ -192,7 +192,8 @@ To enable the export of
 1. On the top bar, select **Main menu > Admin**.
 1. On the left sidebar, select **Settings > General**.
 1. Expand the **Visibility and access controls** section.
-1. Select **Project export enabled**.
+1. Scroll to **Project export**.
+1. Select the **Enabled** checkbox.
 1. Select **Save changes**.
 
 ## Enable migration of groups and projects by direct transfer
diff --git a/doc/user/application_security/sast/customize_rulesets.md b/doc/user/application_security/sast/customize_rulesets.md
index 3d8ad6c8bf6..aec7158d2e4 100644
--- a/doc/user/application_security/sast/customize_rulesets.md
+++ b/doc/user/application_security/sast/customize_rulesets.md
@@ -385,7 +385,7 @@ rules:
   pattern: print("Hello World")
   message: |
     Unauthorized use of Hello World.
-  severity: CRITICAL
+  severity: ERROR
   languages:
   - python
 ```
diff --git a/doc/user/project/import/bitbucket.md b/doc/user/project/import/bitbucket.md
index 2a97848d089..29d29c12536 100644
--- a/doc/user/project/import/bitbucket.md
+++ b/doc/user/project/import/bitbucket.md
@@ -31,11 +31,12 @@ When importing:
 - Repository public access is retained. If a repository is private in Bitbucket, it's created as
   private in GitLab as well.
 
-## Prerequisite for GitLab self-managed
+## Prerequisites
 
-To import your projects from Bitbucket Cloud, the [Bitbucket Cloud integration](../../../integration/bitbucket.md)
-must be enabled. If it isn't enabled, ask your GitLab administrator to enable it. By default it's
-enabled on GitLab.com.
+- [Bitbucket Cloud integration](../../../integration/bitbucket.md) must be enabled. If that integration is not enabled, ask your GitLab administrator
+  to enable it. The Bitbucket Cloud integration is enabled by default on GitLab.com.
+- At least the Maintainer role on the destination group to import to. Using the Developer role for this purpose was
+  [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/387891) in GitLab 15.8 and will be removed in GitLab 16.0.
 
 ## How it works
 
diff --git a/doc/user/project/import/bitbucket_server.md b/doc/user/project/import/bitbucket_server.md
index d7fa1338c55..db2a1d956ab 100644
--- a/doc/user/project/import/bitbucket_server.md
+++ b/doc/user/project/import/bitbucket_server.md
@@ -24,10 +24,11 @@ created as private in GitLab as well.
 
 ## Import your Bitbucket repositories
 
-Prerequisite:
+Prerequisites:
 
-- An administrator must have enabled the **Bitbucket Server** in
-  **Admin > Settings > General > Visibility and access controls > Import sources**.
+- An administrator must enable **Bitbucket Server** in  **Admin > Settings > General > Visibility and access controls > Import sources**.
+- At least the Maintainer role on the destination group to import to. Using the Developer role for this purpose was
+  [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/387891) in GitLab 15.8 and will be removed in GitLab 16.0.
 
 To import your Bitbucket repositories:
 
diff --git a/doc/user/project/import/fogbugz.md b/doc/user/project/import/fogbugz.md
index f6395fd9234..08ee4c70dda 100644
--- a/doc/user/project/import/fogbugz.md
+++ b/doc/user/project/import/fogbugz.md
@@ -14,6 +14,11 @@ The importer imports all of your cases and comments with the original
 case numbers and timestamps. You can also map FogBugz users to GitLab
 users.
 
+Prerequisite:
+
+- At least the Maintainer role on the destination group to import to. Using the Developer role for this purpose was
+  [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/387891) in GitLab 15.8 and will be removed in GitLab 16.0.
+
 To import your project from FogBugz:
 
 1. Sign in to GitLab.
diff --git a/doc/user/project/import/gitea.md b/doc/user/project/import/gitea.md
index ed9e59569d4..fb64c902b38 100644
--- a/doc/user/project/import/gitea.md
+++ b/doc/user/project/import/gitea.md
@@ -13,6 +13,11 @@ Import your projects from Gitea to GitLab with minimal effort.
 NOTE:
 This requires Gitea `v1.0.0` or later.
 
+Prerequisite:
+
+- At least the Maintainer role on the destination group to import to. Using the Developer role for this purpose was
+  [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/387891) in GitLab 15.8 and will be removed in GitLab 16.0.
+
 The Gitea importer can import:
 
 - Repository description
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index 723115f3809..da3637541d9 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -57,6 +57,9 @@ For an overview of the import process, see the video [Migrating from GitHub to G
 
 ## Prerequisites
 
+At least the Maintainer role on the destination group to import to. Using the Developer role for this purpose was
+[deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/387891) in GitLab 15.8 and will be removed in GitLab 16.0.
+
 When issues and pull requests are being imported, the importer attempts to find
 their GitHub authors and assignees in the database of the GitLab instance. Pull requests are called _merge requests_ in
 GitLab.
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index 38755fba5bd..ad1472daa50 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -15,7 +15,11 @@ If you want to bring existing projects to GitLab or copy GitLab projects to a di
   - Between a self-managed instance and GitLab.com in both directions.
   - In the same GitLab instance.
 
-For any type of source and target, you can migrate projects:
+Prerequisite:
+
+- At least the Maintainer role on the destination group to import to. Using the Developer role for this purpose was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/387891) in GitLab 15.8 and will be removed in GitLab 16.0.
+
+For any type of source and target, you can migrate GitLab projects:
 
 - When [migrating groups by direct transfer](../../group/import/index.md#migrate-groups-by-direct-transfer-recommended), which allows you to migrate all
   projects in a group at once. Migrating projects by direct transfer is in [Beta](../../../policy/alpha-beta-support.md#beta-features). The feature is not ready
diff --git a/doc/user/project/import/manifest.md b/doc/user/project/import/manifest.md
index ea26613639d..c125102b0c9 100644
--- a/doc/user/project/import/manifest.md
+++ b/doc/user/project/import/manifest.md
@@ -17,11 +17,10 @@ repositories like the Android Open Source Project (AOSP).
 
 ## Requirements
 
-GitLab must be using PostgreSQL for its database, since
-[subgroups](../../group/subgroups/index.md) are needed for the manifest import
-to work.
-
-Read more about the [database requirements](../../../install/requirements.md#database).
+- GitLab must use PostgreSQL for its database, because [subgroups](../../group/subgroups/index.md) are needed for the manifest import
+  to work. Read more about the [database requirements](../../../install/requirements.md#database).
+- At least the Maintainer role on the destination group to import to. Using the Developer role for this purpose was
+  [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/387891) in GitLab 15.8 and will be removed in GitLab 16.0.
 
 ## Manifest format
 
diff --git a/doc/user/project/import/repo_by_url.md b/doc/user/project/import/repo_by_url.md
index d6f4f862b95..93e3991ba19 100644
--- a/doc/user/project/import/repo_by_url.md
+++ b/doc/user/project/import/repo_by_url.md
@@ -7,6 +7,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Import project from repository by URL **(FREE)**
 
+Prerequisite:
+
+- At least the Maintainer role on the destination group to import to. Using the Developer role for this purpose was
+  [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/387891) in GitLab 15.8 and will be removed in GitLab 16.0.
+
 You can import your existing repositories by providing the Git URL:
 
 1. In GitLab, on the top bar, select **Main menu > Projects > View all projects**.
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index e742779bf0f..c86df4e2c19 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -29,18 +29,20 @@ If you migrate from GitLab.com to self-managed GitLab, an administrator can crea
 
 ## Configure file exports as an import source **(FREE SELF)**
 
-Before you can migrate projects on a self-managed GitLab instance using file exports, GitLab administrators must enable file exports as an import source for the instance. On
-GitLab.com, file exports are already enabled as an import source.
+Before you can migrate projects on a self-managed GitLab instance using file exports, GitLab administrators must:
 
-To enable file exports as an import source:
+1. [Enable file exports](../../admin_area/settings/visibility_and_access_controls.md#enable-project-export) on the source
+   instance.
+1. Enable file exports as an import source for the destination instance. On GitLab.com, file exports are already enabled
+   as an import source.
+
+To enable file exports as an import source for the destination instance:
 
 1. On the top bar, select **Main menu > Admin**.
 1. On the left sidebar, select **Settings > General**.
 1. Expand **Visibility and access controls**.
 1. Scroll to **Import sources**.
 1. Select the **GitLab export** checkbox.
-1. Then scroll to **Project export**.
-1. Select the **Enable** checkbox.
 
 ## Between CE and EE