Add latest changes from gitlab-org/gitlab@master

10 files changed, 10 insertions, 2 deletions

diff --git a/doc/administration/raketasks/uploads/migrate.md b/doc/administration/raketasks/uploads/migrate.md
index b6f14bc6fa4..99f6373af2c 100644
--- a/doc/administration/raketasks/uploads/migrate.md
+++ b/doc/administration/raketasks/uploads/migrate.md
@@ -42,7 +42,7 @@ gitlab-rake "gitlab:uploads:migrate:all"
 sudo RAILS_ENV=production -u git -H bundle exec rake gitlab:uploads:migrate:all
 ```
 
-You can optionally track progress and verify that all packages migrated successfully using the
+You can optionally track progress and verify that all uploads migrated successfully using the
 [PostgreSQL console](https://docs.gitlab.com/omnibus/settings/database.html#connecting-to-the-bundled-postgresql-database):
 
 - `sudo gitlab-rails dbconsole` for Omnibus GitLab instances.
diff --git a/doc/architecture/blueprints/pods/iteration0-organizations-introduction.png b/doc/architecture/blueprints/pods/iteration0-organizations-introduction.png
index 5f5cad7b169..5725b0fa71f 100644
--- a/doc/architecture/blueprints/pods/iteration0-organizations-introduction.png
+++ b/doc/architecture/blueprints/pods/iteration0-organizations-introduction.png
diff --git a/doc/architecture/blueprints/pods/term-cluster.png b/doc/architecture/blueprints/pods/term-cluster.png
index f52e31b52ad..87e4d631551 100644
--- a/doc/architecture/blueprints/pods/term-cluster.png
+++ b/doc/architecture/blueprints/pods/term-cluster.png
diff --git a/doc/architecture/blueprints/pods/term-organization.png b/doc/architecture/blueprints/pods/term-organization.png
index f605adb124d..4c82c62b8f4 100644
--- a/doc/architecture/blueprints/pods/term-organization.png
+++ b/doc/architecture/blueprints/pods/term-organization.png
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md
index cdb6dc88446..a23858c0980 100644
--- a/doc/ci/yaml/index.md
+++ b/doc/ci/yaml/index.md
@@ -4106,6 +4106,8 @@ successfully complete before starting.
   shows **pending** (**{status_pending}**) if the downstream pipeline status is
   **waiting for manual action** (**{status_manual}**) due to manual jobs. By default,
   jobs in later stages do not start until the trigger job completes.
+- If the downstream pipeline has a failed job, but the job uses [`allow_failure: true`](#allow_failure),
+  the downstream pipeline is considered successful and the trigger job shows **success**.
 
 #### `trigger:forward`
 
diff --git a/doc/development/sec/img/primary_identifier_changed_v15_6.png b/doc/development/sec/img/primary_identifier_changed_v15_6.png
index 6bdca5152f2..aa1a116c801 100644
--- a/doc/development/sec/img/primary_identifier_changed_v15_6.png
+++ b/doc/development/sec/img/primary_identifier_changed_v15_6.png
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index 4a6d3151437..f21e1312eef 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -1152,6 +1152,9 @@ To delete an on-demand scan:
 
 ## Site profile
 
+> - Scan method [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/345837) in GitLab 15.6.
+> - File URL [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/345837) in GitLab 15.6.
+
 A site profile defines the attributes and configuration details of the deployed application,
 website, or API to be scanned by DAST. A site profile can be referenced in `.gitlab-ci.yml` and
 on-demand scans.
@@ -1172,6 +1175,9 @@ A site profile contains:
   - **Password form field**: The name of password field at the sign-in HTML form.
   - **Submit form field**: The `id` or `name` of the element that when selected submits the sign-in HTML form.
 
+- **Scan method**: A type of method to perform API testing. The supported methods are OpenAPI, Postman Collections, and HTTP Archive (HAR) documents.
+- **File URL**: The URL of the OpenAPI, Postman Collection, or HTTP Archive file.
+
 When an API site type is selected, a [host override](#host-override) is used to ensure the API being scanned is on the same host as the target. This is done to reduce the risk of running an active scan against the wrong API.
 
 When configured, request headers and password fields are encrypted using [`aes-256-gcm`](https://en.wikipedia.org/wiki/Advanced_Encryption_Standard) before being stored in the database.
diff --git a/doc/user/application_security/img/secure_tools_and_cicd_stages.png b/doc/user/application_security/img/secure_tools_and_cicd_stages.png
index 3dbfd835baf..3284b376adc 100644
--- a/doc/user/application_security/img/secure_tools_and_cicd_stages.png
+++ b/doc/user/application_security/img/secure_tools_and_cicd_stages.png
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index 40a118e3f23..c0cf584f8c3 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -168,7 +168,7 @@ If an issue or merge request is locked and closed, you cannot reopen it.
 > - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87403) from "confidential comments" to "internal notes" in GitLab 15.0.
 > - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87383) in GitLab 15.0.
 > - [Feature flag `confidential_notes`](https://gitlab.com/gitlab-org/gitlab/-/issues/362712) removed in GitLab 15.2.
-> - [Changed] permissions in GitLab 15.5 to at least the Reporter role. In GitLab 15.4 and earlier, issue or epic authors and assignees could also read and create internal notes.
+> - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/363045) permissions in GitLab 15.5 to at least the Reporter role. In GitLab 15.4 and earlier, issue or epic authors and assignees could also read and create internal notes.
 
 You can add an internal note **to an issue or an epic**. It's then visible only to project members who have at least the Reporter role.
 
diff --git a/doc/user/group/roadmap/img/roadmap_blocked_icon_v15_5.png b/doc/user/group/roadmap/img/roadmap_blocked_icon_v15_5.png
index 52130672e5a..625e4afc714 100644
--- a/doc/user/group/roadmap/img/roadmap_blocked_icon_v15_5.png
+++ b/doc/user/group/roadmap/img/roadmap_blocked_icon_v15_5.png