Add latest changes from gitlab-org/gitlab@master

14 files changed, 9 insertions, 7 deletions

diff --git a/doc/administration/dedicated/index.md b/doc/administration/dedicated/index.md
index 005017c6178..64a0d80fdcc 100644
--- a/doc/administration/dedicated/index.md
+++ b/doc/administration/dedicated/index.md
@@ -35,9 +35,11 @@ If you've been granted access to Switchboard, you receive an email invitation wi
 Your invitation to Switchboard is valid for seven days. If you are having issues accessing
 Switchboard, or if your invitation has expired, please [submit a support ticket](https://support.gitlab.com/hc/en-us/requests/new?ticket_form_id=4414917877650).
 
-NOTE:
 The credentials for Switchboard are separate from any other GitLab credentials you may already have to sign in to a GitLab self-managed or GitLab.com instance.
 
+NOTE:
+If you log in to Switchboard through a VPN, you may experience a `403 Forbidden` error. The workaround is to log in directly rather than through a VPN.
+
 After you first sign in to Switchboard, you must update your password and set up MFA before you can complete your onboarding to create a new instance.
 
 The following stages guide you through a series of four steps to provide the information required to create your GitLab Dedicated instance.
diff --git a/doc/ci/img/dsm_secret_import_1.png b/doc/ci/img/dsm_secret_import_1.png
deleted file mode 100644
index fd0b6f612f5..00000000000
--- a/doc/ci/img/dsm_secret_import_1.png
+++ /dev/null
diff --git a/doc/ci/img/dsm_secret_import_2.png b/doc/ci/img/dsm_secret_import_2.png
deleted file mode 100644
index b1657affcd8..00000000000
--- a/doc/ci/img/dsm_secret_import_2.png
+++ /dev/null
diff --git a/doc/ci/img/dsm_secrets.png b/doc/ci/img/dsm_secrets.png
deleted file mode 100644
index 0c4e687e519..00000000000
--- a/doc/ci/img/dsm_secrets.png
+++ /dev/null
diff --git a/doc/ci/img/gitlab_build_result_1.png b/doc/ci/img/gitlab_build_result_1.png
deleted file mode 100644
index 43169c5ed91..00000000000
--- a/doc/ci/img/gitlab_build_result_1.png
+++ /dev/null
diff --git a/doc/ci/img/gitlab_build_result_2.png b/doc/ci/img/gitlab_build_result_2.png
deleted file mode 100644
index 5bc34740be8..00000000000
--- a/doc/ci/img/gitlab_build_result_2.png
+++ /dev/null
diff --git a/doc/ci/img/gitlab_build_result_3.png b/doc/ci/img/gitlab_build_result_3.png
deleted file mode 100644
index 3c3727ef9ce..00000000000
--- a/doc/ci/img/gitlab_build_result_3.png
+++ /dev/null
diff --git a/doc/ci/secrets/fortanix_dsm_integration.md b/doc/ci/secrets/fortanix_dsm_integration.md
index 06758510196..2b6a37086a5 100644
--- a/doc/ci/secrets/fortanix_dsm_integration.md
+++ b/doc/ci/secrets/fortanix_dsm_integration.md
@@ -130,9 +130,9 @@ To generate a new secret in Fortanix DSM and use it with GitLab:
    If not, select **Build > Pipelines > Run pipeline**.
 1. Go to **Build > Jobs** and check the `build` job's log:
 
-   - ![gitlab_build_result_1](../img/gitlab_build_result_1.png)
+   - ![gitlab_build_result_1](img/gitlab_build_result_1.png)
 
-![dsm_secrets](../img/dsm_secrets.png)
+![dsm_secrets](img/dsm_secrets.png)
 
 ## Use an existing secret from Fortanix DSM
 
@@ -140,7 +140,7 @@ To use a secret that already exists in Fortanix DSM with GitLab:
 
 1. The secret must be marked as exportable in Fortanix:
 
-   ![dsm_secret_import_1](../img/dsm_secret_import_1.png)
+   ![dsm_secret_import_1](img/dsm_secret_import_1.png)
 
 1. In GitLab, go to your project.
 1. Go to **Settings > CI/CD > Variables**, and add these variables:
@@ -170,7 +170,7 @@ To use a secret that already exists in Fortanix DSM with GitLab:
    If not, select **Build > Pipelines > Run pipeline**.
 1. Go to **Build > Jobs** and check the `build` job's log:
 
-   - ![gitlab_build_result_2](../img/gitlab_build_result_2.png)
+   - ![gitlab_build_result_2](img/gitlab_build_result_2.png)
 
 ## Code Signing
 
@@ -179,7 +179,7 @@ To set up code signing securely in your GitLab environment:
 1. Log in to your Fortanix DSM account.
 1. Import `keystore_password` and `key_password` as secrets in Fortanix DSM. Ensure that they are marked as exportable.
 
-   ![dsm_secret_import_2](../img/dsm_secret_import_2.png)
+   ![dsm_secret_import_2](img/dsm_secret_import_2.png)
 
 1. In GitLab, go to your project.
 1. Go to **Settings > CI/CD > Variables**, and add these variables:
@@ -219,4 +219,4 @@ To set up code signing securely in your GitLab environment:
    If not, select **Build > Pipelines > Run pipeline**.
 1. Go to **Build > Jobs** and check the `build` job's log:
 
-   - ![gitlab_build_result_3](../img/gitlab_build_result_3.png)
+   - ![gitlab_build_result_3](img/gitlab_build_result_3.png)
diff --git a/doc/ci/secrets/img/dsm_secret_import_1.png b/doc/ci/secrets/img/dsm_secret_import_1.png
new file mode 100644
index 00000000000..edf8c3a0590
--- /dev/null
+++ b/doc/ci/secrets/img/dsm_secret_import_1.png
diff --git a/doc/ci/secrets/img/dsm_secret_import_2.png b/doc/ci/secrets/img/dsm_secret_import_2.png
new file mode 100644
index 00000000000..abb45092cd0
--- /dev/null
+++ b/doc/ci/secrets/img/dsm_secret_import_2.png
diff --git a/doc/ci/secrets/img/dsm_secrets.png b/doc/ci/secrets/img/dsm_secrets.png
new file mode 100644
index 00000000000..ea4083426ed
--- /dev/null
+++ b/doc/ci/secrets/img/dsm_secrets.png
diff --git a/doc/ci/secrets/img/gitlab_build_result_1.png b/doc/ci/secrets/img/gitlab_build_result_1.png
new file mode 100644
index 00000000000..7867291e519
--- /dev/null
+++ b/doc/ci/secrets/img/gitlab_build_result_1.png
diff --git a/doc/ci/secrets/img/gitlab_build_result_2.png b/doc/ci/secrets/img/gitlab_build_result_2.png
new file mode 100644
index 00000000000..a4966eec145
--- /dev/null
+++ b/doc/ci/secrets/img/gitlab_build_result_2.png
diff --git a/doc/ci/secrets/img/gitlab_build_result_3.png b/doc/ci/secrets/img/gitlab_build_result_3.png
new file mode 100644
index 00000000000..f0a7a891038
--- /dev/null
+++ b/doc/ci/secrets/img/gitlab_build_result_3.png