Add latest changes from gitlab-org/gitlab@master

4 files changed, 15 insertions, 12 deletions

diff --git a/doc/user/group/epics/manage_epics.md b/doc/user/group/epics/manage_epics.md
index 4a6fa1fb9fe..7bb021b4b1f 100644
--- a/doc/user/group/epics/manage_epics.md
+++ b/doc/user/group/epics/manage_epics.md
@@ -204,6 +204,13 @@ To make an epic confidential:
 This section collects instructions for all the things you can do with [issues](../../project/issues/index.md)
 in relation to epics.
 
+### View count of issues in an epic
+
+On the **Epics and Issues** tab, under each epic name, hover over the total counts.
+
+The number indicates all epics associated with the project, including issues
+you might not have permission to.
+
 ### Add a new issue to an epic
 
 You can add an existing issue to an epic, or create a new issue that's
@@ -231,13 +238,6 @@ To add a new issue to an epic:
    If there are multiple issues to be added, press <kbd>Space</kbd> and repeat this step.
 1. Select **Add**.
 
-#### View count of issues in an epic
-
-On the **Epics and Issues** tab, under each epic name, hover over the total counts.
-
-The number indicates all epics associated with the project, including issues
-you might not have permission to.
-
 #### Create an issue from an epic
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/5419) in GitLab 12.7.
diff --git a/doc/user/project/repository/index.md b/doc/user/project/repository/index.md
index 70c5ef63dd4..33f439836b5 100644
--- a/doc/user/project/repository/index.md
+++ b/doc/user/project/repository/index.md
@@ -208,7 +208,7 @@ The repository graph displays the history of the repository network visually, in
 
 Find it under your project's **Repository > Graph**.
 
-## Repository Languages
+## Repository languages
 
 For the default branch of each repository, GitLab determines what programming languages
 were used and displays this on the project's pages. If this information is missing, it's
@@ -268,7 +268,7 @@ All projects can be cloned into Visual Studio Code. To do that:
 
 When VS Code has successfully cloned your project, it opens the folder.
 
-## Download Source Code
+## Download source code
 
 > - Support for directory download was [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/24704) in GitLab 11.11.
 > - Support for [including Git LFS blobs](../../../topics/git/lfs#lfs-objects-in-project-archives) was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15079) in GitLab 13.5.
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index 7c87630fe72..7c45fc26bf9 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -47,6 +47,8 @@ Note the following:
 - Imported users can be mapped by their primary email on self-managed instances, if an administrative user (not an owner) does the import.
   Otherwise, a supplementary comment is left to mention that the original author and
   the MRs, notes, or issues are owned by the importer.
+  - For project migration imports performed over GitLab.com Groups, preserving author information is
+    possible through a [professional services engagement](https://about.gitlab.com/services/migration/).
 - If an imported project contains merge requests originating from forks,
   then new branches associated with such merge requests are created
   within a project during the import/export. Thus, the number of branches
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md
index a816fb4b009..d38ac78162d 100644
--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -40,7 +40,7 @@ The project description also partially supports [standard Markdown](../../markdo
 You can create a framework label to identify that your project has certain compliance requirements or needs additional oversight.
 
 Group owners can create, edit and delete compliance frameworks by going to **Settings** > **General** and expanding the **Compliance frameworks** section.
-Compliance frameworks created can then be assigned to any number of projects via the project settings page inside the group or subgroups. 
+Compliance frameworks created can then be assigned to any number of projects via the project settings page inside the group or subgroups.
 
 NOTE:
 Attempting to create compliance frameworks on subgroups via GraphQL will cause the framework to be created on the root ancestor if the user has the correct permissions.
@@ -193,8 +193,9 @@ Set up your project's merge request settings:
 - Enable [merge request approvals](../merge_requests/approvals/index.md).
 - Enable [merge only if pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md).
 - Enable [merge only when all threads are resolved](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved).
-- Enable [`delete source branch after merge` option by default](../merge_requests/getting_started.md#deleting-the-source-branch)
-- Configure [suggested changes commit messages](../merge_requests/reviews/suggestions.md#configure-the-commit-message-for-applied-suggestions)
+- Enable [require an associated issue from Jira](../../../integration/jira/issues.md#require-associated-jira-issue-for-merge-requests-to-be-merged).
+- Enable [`delete source branch after merge` option by default](../merge_requests/getting_started.md#deleting-the-source-branch).
+- Configure [suggested changes commit messages](../merge_requests/reviews/suggestions.md#configure-the-commit-message-for-applied-suggestions).
 - Configure [the default target project](../merge_requests/creating_merge_requests.md#set-the-default-target-project) for merge requests coming from forks.
 
 ### Service Desk