Add latest changes from gitlab-org/gitlab@master

6 files changed, 17 insertions, 38 deletions

diff --git a/doc/development/import_project.md b/doc/development/import_project.md
index ed5854f8833..0be17ea5873 100644
--- a/doc/development/import_project.md
+++ b/doc/development/import_project.md
@@ -52,6 +52,12 @@ There is also an option to [import the project via GitHub](../user/project/impor
 
 This method takes longer to import than the other methods and depends on several factors. It's recommended to use the other methods.
 
+To test importing from GitHub Enterprise (GHE) to GitLab, you need a GHE instance. You can request a
+[GitHub Enterprise Server trial](https://docs.github.com/en/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server) and install it on Google Cloud Platform.
+
+- GitLab team members can use [Sandbox Cloud Realm](https://about.gitlab.com/handbook/infrastructure-standards/realms/sandbox/) for this purpose.
+- Others can request a [Google Cloud Platforms free trial](https://cloud.google.com/free).
+
 ### Import by using a Rake task
 
 To import the test project by using a Rake task, see
diff --git a/doc/operations/incident_management/slack.md b/doc/operations/incident_management/slack.md
index 1f6097ccbdb..d04332ddcaf 100644
--- a/doc/operations/incident_management/slack.md
+++ b/doc/operations/incident_management/slack.md
@@ -19,8 +19,6 @@ Use the GitLab for Slack app to:
 
 - Create GitLab incidents from Slack.
 - Receive incident notifications.
-<!-- The below content is commented out until these features are implemented in https://gitlab.com/groups/gitlab-org/-/epics/8545 -->
-<!-- - Send important updates between Slack and GitLab incidents. -->
 
 Incident management for Slack is only available for GitLab.com. Some of the functionality
 described might be available for
@@ -44,18 +42,6 @@ Prerequisites:
    The `<project-alias>` you select must be a project that has the GitLab for Slack app set up.
    For more information, see [issue 377548](https://gitlab.com/gitlab-org/gitlab/-/issues/377548).
 
-<!-- The below content is commented out until these features are implemented in https://gitlab.com/groups/gitlab-org/-/epics/8545 -->
-<!--
-To manage incidents, use the following slash commands in Slack:
-
-| Command                            | Description                                 |
-| ---------------------------------- | ------------------------------------------- |
-| `/gitlab incident declare`         | Creates an incident in GitLab.              |
-| `/gitlab incident comment <text>`  | Adds a comment on a GitLab incident.        |
-| `/gitlab incident timeline <text>` | Adds a timeline event to a GitLab incident. |
-| `/gitlab incident close`           | Closes an incident in GitLab.               |
--->
-
 After the GitLab for Slack app is configured, you can also use any of the existing [Slack slash commands](../../user/project/integrations/slack_slash_commands.md).
 
 ## Declare an incident
@@ -94,24 +80,6 @@ a GitLab incident from Slack. The following quick actions might be most relevant
 | `/link <URL> <text>`     | Adds a link to a dedicated Slack channel, runbook, or any relevant resource to the `Related resources` section of an incident. |
 | `/zoom <URL>`            | Adds a Zoom meeting link to the incident. |
 
-<!-- The below content is commented out until these features are implemented in https://gitlab.com/groups/gitlab-org/-/epics/8545 -->
-<!-- ### Comment on a GitLab incident
-
-To comment on a GitLab incident from Slack, enter the `/gitlab incident comment <text>` slash command.
-Slack shows a prompt asking you to confirm which incident you'd like to post your comment to.
-
-### Add a timeline event
-
-To add a [timeline event](incident_timeline_events.md) to a GitLab incident from Slack, enter the
-`/gitlab incident timeline <text>` slash command.
-Slack shows a prompt asking you to confirm which incident you'd like to add your timeline event to.
-
-### Close an incident
-
-To close a GitLab incident from Slack when it is resolved, enter the `/gitlab incident close`
-slash command.
-Slack shows a prompt asking you to confirm which incident you'd like to close.  -->
-
 ## Send GitLab incident notifications to Slack
 
 If you have [enabled notifications](#manage-an-incident-from-slack) for incidents, you should receive
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index e7732c02fdf..6b88e87cf5a 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -17,9 +17,11 @@ The namespace is a user or group in GitLab, such as `gitlab.com/sidney-jones` or
 `gitlab.com/customer-success`. You can use bulk actions in the rails console to move projects to
 different namespaces.
 
-If you are importing to a self-managed GitLab instance, you can use the
-[GitHub Rake task](../../../administration/raketasks/github_import.md) instead. This allows you to import projects
-without the constraints of a [Sidekiq](../../../development/sidekiq/index.md) worker.
+- If you are importing to a self-managed GitLab instance, you can use the [GitHub Rake task](../../../administration/raketasks/github_import.md) instead. The
+  Rake task imports projects without the constraints of a [Sidekiq](../../../development/sidekiq/index.md) worker.
+- If you are importing from GitHub Enterprise to GitLab.com, use the
+  [GitLab Import API](../../../api/import.md#import-repository-from-github) GitHub endpoint instead. This allows you to provide a different domain to import the project from.
+  Using the UI, the GitHub importer always imports from the `github.com` domain.
 
 When importing projects:
 
@@ -185,7 +187,7 @@ To open an repository in GitLab URL after it has been imported, select its GitLa
 
 Completed imports can be re-imported by selecting **Re-import** and specifying new name. This creates a new copy of the source project.
 
-![GitHub importer page](img/import_projects_from_github_importer_v12_3.png)
+![GitHub importer page](img/import_projects_from_github_importer_v16_0.png)
 
 ### Check status of imports
 
@@ -193,9 +195,9 @@ Completed imports can be re-imported by selecting **Re-import** and specifying n
 
 After imports are completed, they can be in one of three states:
 
-- **Completed**: GitLab imported all repository entities.
+- **Complete**: GitLab imported all repository entities.
 - **Partially completed**: GitLab failed to import some repository entities.
-- **Failed**: GitLab imported no repository entities.
+- **Failed**: GitLab aborted the import after a critical error occurred.
 
 Expand **Details** to see a list of [repository entities](#imported-data) that failed to import.
 
diff --git a/doc/user/project/import/img/import_projects_from_github_importer_v12_3.png b/doc/user/project/import/img/import_projects_from_github_importer_v12_3.png
deleted file mode 100644
index 3ac03c0ecc5..00000000000
--- a/doc/user/project/import/img/import_projects_from_github_importer_v12_3.png
+++ /dev/null
diff --git a/doc/user/project/import/img/import_projects_from_github_importer_v16_0.png b/doc/user/project/import/img/import_projects_from_github_importer_v16_0.png
new file mode 100644
index 00000000000..190474c4d89
--- /dev/null
+++ b/doc/user/project/import/img/import_projects_from_github_importer_v16_0.png
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md
index 2df86038789..47500673b99 100644
--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -59,6 +59,9 @@ compliance framework using either:
   compliance frameworks on subgroups with GraphQL, the framework is created on the root ancestor if the user has the
   correct permissions. The GitLab UI presents a read-only view to discourage this behavior.
 
+NOTE:
+Frameworks can not be added to projects in personal namespaces.
+
 ## Configure project visibility, features, and permissions
 
 To configure visibility, features, and permissions for a project: