Add latest changes from gitlab-org/gitlab@master

5 files changed, 12 insertions, 3 deletions

diff --git a/doc/api/pipelines.md b/doc/api/pipelines.md
index ad7336bba8f..8348dd2ae43 100644
--- a/doc/api/pipelines.md
+++ b/doc/api/pipelines.md
@@ -32,6 +32,7 @@ GET /projects/:id/pipelines
 | `id`      | integer/string | yes      | The ID or [URL-encoded path of the project](index.md#namespaced-path-encoding) owned by the authenticated user |
 | `scope`   | string  | no       | The scope of pipelines, one of: `running`, `pending`, `finished`, `branches`, `tags` |
 | `status`  | string  | no       | The status of pipelines, one of: `created`, `waiting_for_resource`, `preparing`, `pending`, `running`, `success`, `failed`, `canceled`, `skipped`, `manual`, `scheduled` |
+| `source`  | string  | no       | In [GitLab 14.3 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/325439), how the pipeline was triggered, one of: `push`, `web`, `trigger`, `schedule`, `api`, `external`, `pipeline`, `chat`, `webide`, `merge_request_event`, `external_pull_request_event`, `parent_pipeline`, `ondemand_dast_scan`, or `ondemand_dast_validation`. |
 | `ref`     | string  | no       | The ref of pipelines |
 | `sha`     | string  | no       | The SHA of pipelines |
 | `yaml_errors`| boolean  | no       | Returns pipelines with invalid configurations |
@@ -55,6 +56,7 @@ Example of response
     "iid": 12,
     "project_id": 1,
     "status": "pending",
+    "soure": "push",
     "ref": "new-pipeline",
     "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
     "web_url": "https://example.com/foo/bar/pipelines/47",
@@ -66,6 +68,7 @@ Example of response
     "iid": 13,
     "project_id": 1,
     "status": "pending",
+    "soure": "web",
     "ref": "new-pipeline",
     "sha": "eb94b618fb5865b26e80fdd8ae531b7a63ad851a",
     "web_url": "https://example.com/foo/bar/pipelines/48",
diff --git a/doc/ci/pipelines/index.md b/doc/ci/pipelines/index.md
index f52e82e6840..631b39de0db 100644
--- a/doc/ci/pipelines/index.md
+++ b/doc/ci/pipelines/index.md
@@ -122,6 +122,7 @@ you can filter the pipeline list by:
 - Branch name
 - Status ([GitLab 13.1 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/217617))
 - Tag ([GitLab 13.1 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/217617))
+- Source ([GitLab 14.3 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/338347))
 
 [Starting in GitLab 14.2](https://gitlab.com/gitlab-org/gitlab/-/issues/26621), you can change the
 pipeline column to display the pipeline ID or the pipeline IID.
diff --git a/doc/development/import_export.md b/doc/development/import_export.md
index bc1927fffde..2a29df380de 100644
--- a/doc/development/import_export.md
+++ b/doc/development/import_export.md
@@ -259,7 +259,7 @@ Only include the following attributes for the models specified:
 included_attributes:
   user:
     - :id
-    - :email
+    - :public_email
   # ...
 ```
 
diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md
index 8bc08bf89d3..33725c289eb 100644
--- a/doc/integration/jira/connect-app.md
+++ b/doc/integration/jira/connect-app.md
@@ -6,6 +6,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # GitLab.com for Jira Cloud app **(FREE)**
 
+NOTE:
+Only Jira users with administrator level access are able to install or configure
+the GitLab app for Jira Cloud.
+
 ## GitLab.com for Jira Cloud app **(FREE SAAS)**
 
 You can integrate GitLab.com and Jira Cloud using the
@@ -39,7 +43,8 @@ For a walkthrough of the integration with GitLab.com for Jira Cloud app, watch
    ![Sign in to GitLab.com in GitLab.com for Jira Cloud app](img/jira_dev_panel_setup_com_3_v13_9.png)
 1. Select **Add namespace** to open the list of available namespaces.
 
-1. Identify the namespace you want to link, and select **Link**.
+1. Identify the namespace you want to link, and select **Link**. Only Jira site
+   administrators are permitted to add or remove namespaces for an installation.
 
    ![Link namespace in GitLab.com for Jira Cloud app](img/jira_dev_panel_setup_com_4_v13_9.png)
 
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index 82dcd4a1a13..de92dbf240b 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -44,7 +44,7 @@ Note the following:
 - Group members are exported as project members, as long as the user has
   a maintainer or administrator role in the group where the exported project lives.
 - Project members with the [Owner role](../../permissions.md) are imported as Maintainers.
-- Imported users can be mapped by their primary email on self-managed instances, if an administrative user (not an owner) does the import.
+- Imported users can be mapped by their public email on self-managed instances, if an administrative user (not an owner) does the import.
   Additionally, the user must be an existing member of the namespace, or the user can be added as a
 member of the project for contributions to be mapped.
   Otherwise, a supplementary comment is left to mention that the original author and