Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

3 files changed, 13 insertions, 8 deletions

diff --git a/doc/user/project/import/bitbucket_server.md b/doc/user/project/import/bitbucket_server.md
index 81e7d159a06..da47b673c29 100644
--- a/doc/user/project/import/bitbucket_server.md
+++ b/doc/user/project/import/bitbucket_server.md
@@ -33,6 +33,7 @@ created as private in GitLab as well.
   and quote part of the original comment.
 - Declined pull requests have unreachable commits, which prevents the GitLab importer from
   generating a proper diff. These pull requests show up as empty changes.
+- Pull request approvals are not imported.
 - Attachments in Markdown are not imported.
 - Task lists are not imported.
 - Emoji reactions are not imported.
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index 72bf0841687..d4cca723333 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -26,6 +26,7 @@ The following aspects of a project are imported:
 - Regular issue and pull request comments
 - [Git Large File Storage (LFS) Objects](../../../topics/git/lfs/index.md)
 - Pull request comments replies in discussions ([GitLab.com & 14.5+](https://gitlab.com/gitlab-org/gitlab/-/issues/336596))
+- Diff Notes suggestions ([GitLab.com & 14.7+](https://gitlab.com/gitlab-org/gitlab/-/issues/340624)) [with a flag](../../../administration/feature_flags.md) named `github_importer_use_diff_note_with_suggestions`. Enabled by default.
 
 References to pull requests and issues are preserved (GitLab.com & 8.7+), and
 each imported repository maintains visibility level unless that [visibility
@@ -164,16 +165,16 @@ your GitHub repositories are listed.
 
 ![GitHub importer page](img/import_projects_from_github_importer_v12_3.png)
 
-## Mirror a repository and share pipeline status
+## Mirror a repository and share pipeline status **(PREMIUM)**
 
 Depending on your GitLab tier, [repository mirroring](../repository/mirror/index.md) can be set up to keep
 your imported repository in sync with its GitHub copy.
 
-Additionally, you can configure GitLab to send pipeline status updates back GitHub with the
-[GitHub Project Integration](../integrations/github.md). **(PREMIUM)**
+Additionally, you can configure GitLab to send pipeline status updates back to GitHub with the
+[GitHub Project Integration](../integrations/github.md).
 
 If you import your project using [CI/CD for external repository](../../../ci/ci_cd_for_external_repos/index.md), then both
-of the above are automatically configured. **(PREMIUM)**
+of the above are automatically configured.
 
 NOTE:
 Mirroring does not sync any new or updated pull requests from your GitHub project.
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index 9d7ed593d41..001f0d56cc5 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -28,7 +28,7 @@ See these documents to migrate to GitLab:
 You can also import any Git repository through HTTP from the **New Project** page. Note that if the
 repository is too large, the import can timeout.
 
-You can also [connect your external repository to get CI/CD benefits](../../../ci/ci_cd_for_external_repos/index.md). **(PREMIUM)**
+You can also [connect your external repository to get CI/CD benefits](../../../ci/ci_cd_for_external_repos/index.md).
 
 ## LFS authentication
 
@@ -42,7 +42,10 @@ However, you can't import issues and merge requests this way. To retain all meta
 merge requests, use the [import/export feature](../settings/import_export.md)
 to export projects from self-managed GitLab and import those projects into GitLab.com. All GitLab
 user associations (such as comment author) are changed to the user importing the project. For more
-information, see [the import notes](../settings/import_export.md#important-notes).
+information, see the prerequisites and important notes in these sections:
+
+- [Export a project and its data](../settings/import_export.md#export-a-project-and-its-data).
+- [Import the project](../settings/import_export.md#import-a-project-and-its-data).
 
 NOTE:
 When migrating to GitLab.com, you must create users manually unless [SCIM](../../../user/group/saml_sso/scim_setup.md)
@@ -56,7 +59,7 @@ Migrate the assets in this order:
 1. [Projects](../../../api/projects.md)
 1. [Project variables](../../../api/project_level_variables.md)
 
-Keep in mind the limitations of the [import/export feature](../settings/import_export.md#exported-contents).
+Keep in mind the limitations of the [import/export feature](../settings/import_export.md#items-that-are-exported).
 
 You must still migrate your [Container Registry](../../packages/container_registry/)
 over a series of Docker pulls and pushes. Re-run any CI pipelines to retrieve any build artifacts.
@@ -87,7 +90,7 @@ to migrate users.
 
 ## Project aliases **(PREMIUM SELF)**
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/3264) in GitLab Premium 12.1.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/3264) in GitLab 12.1.
 
 GitLab repositories are usually accessed with a namespace and a project name. When migrating
 frequently accessed repositories to GitLab, however, you can use project aliases to access those