Add latest changes from gitlab-org/gitlab@master

4 files changed, 43 insertions, 8 deletions

diff --git a/doc/ci/variables/index.md b/doc/ci/variables/index.md
index 7b909cf15f8..dde3981d85e 100644
--- a/doc/ci/variables/index.md
+++ b/doc/ci/variables/index.md
@@ -304,6 +304,26 @@ echo "$KUBE_CA_PEM" > "$(pwd)/kube.ca.pem"
 kubectl config set-cluster e2e --server="$KUBE_URL" --certificate-authority="$(pwd)/kube.ca.pem"
 ```
 
+#### Store multiple values in one variable
+
+It is not possible to create a CI/CD variable that is an array of values, but you
+can use shell scripting techniques for similar behavior.
+
+For example, you can store multiple variables separated by a space in a variable,
+then loop through the values with a script:
+
+```yaml
+job1:
+  variables:
+    FOLDERS: src test docs
+  script:
+    - |
+      for FOLDER in $FOLDERS
+        do
+          echo "The path is root/${FOLDER}"
+        done
+```
+
 ### Mask a CI/CD variable
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/13784) in GitLab 11.10
diff --git a/doc/development/i18n/proofreader.md b/doc/development/i18n/proofreader.md
index ac8af0f9420..76ab00eebfb 100644
--- a/doc/development/i18n/proofreader.md
+++ b/doc/development/i18n/proofreader.md
@@ -99,8 +99,8 @@ are very appreciative of the work done by translators and proofreaders!
   - André Gama - [GitLab](https://gitlab.com/andregamma), [Crowdin](https://crowdin.com/profile/ToeOficial)
   - Eduardo Addad de Oliveira - [GitLab](https://gitlab.com/eduardoaddad), [Crowdin](https://crowdin.com/profile/eduardoaddad)
 - Romanian
-  - Mircea Pop - [GitLab](https://gitlab.com/eeex)[Crowdin](https://crowdin.com/profile/eex)
-  - Rareș Pița - [GitLab](https://gitlab.com/dlphin)[Crowdin](https://crowdin.com/profile/dlphin)
+  - Mircea Pop - [GitLab](https://gitlab.com/eeex), [Crowdin](https://crowdin.com/profile/eex)
+  - Rareș Pița - [GitLab](https://gitlab.com/dlphin), [Crowdin](https://crowdin.com/profile/dlphin)
 - Russian
   - Nikita Grylov - [GitLab](https://gitlab.com/nixel2007), [Crowdin](https://crowdin.com/profile/nixel2007)
   - Alexy Lustin - [GitLab](https://gitlab.com/allustin), [Crowdin](https://crowdin.com/profile/lustin)
diff --git a/doc/development/testing_guide/review_apps.md b/doc/development/testing_guide/review_apps.md
index cf757aad870..72d63fd8194 100644
--- a/doc/development/testing_guide/review_apps.md
+++ b/doc/development/testing_guide/review_apps.md
@@ -175,7 +175,7 @@ For GitLab Team Members only. If you want to sign in to the review app, review
 the GitLab handbook information for the [shared 1Password account](https://about.gitlab.com/handbook/security/#1password-for-teams).
 
 - The default username is `root`.
-- The password can be found in the 1Password secure note named `gitlab-{ce,ee} Review App's root password`.
+- The password can be found in the 1Password login item named `GitLab EE Review App`.
 
 ### Enable a feature flag for my Review App
 
diff --git a/doc/user/clusters/migrating_from_gma_to_project_template.md b/doc/user/clusters/migrating_from_gma_to_project_template.md
index dc16cf5cc45..5144ddc5e06 100644
--- a/doc/user/clusters/migrating_from_gma_to_project_template.md
+++ b/doc/user/clusters/migrating_from_gma_to_project_template.md
@@ -6,11 +6,21 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Migrating from GitLab Managed Apps to a management project template
 
-The [GitLab Managed Apps](applications.md) are deprecated in GitLab 14.0. To migrate to the new way of managing them:
-
-1. Read how the [management project template](management_project_template.md) works, and
-   create a new project based on the "GitLab Cluster Management" template.
-1. Create a new project as explained in the [management project template](management_project_template.md).
+The [GitLab Managed Apps](applications.md) deprecated in GitLab 14.0.
+To manage your apps through a cluster management project, you need a [GitLab Runner](../../ci/runners/index.md) available.
+Then, follow the steps below. You can also watch
+some recorded videos with [live examples](#live-examples).
+
+1. Familiarize yourself with the [management project template](management_project_template.md).
+1. Create a [new project](../project/working_with_projects.md#create-a-project), either:
+   - From a template, selecting the **GitLab Cluster Management** project template.
+   - Importing the project from the URL `https://gitlab.com/gitlab-org/project-templates/cluster-management.git`. This 
+     is useful if you are using GitLab Self-Managed and you want to use the latest version of the template.
+
+   This is your cluster management project.
+   If you are using a self-managed GitLab instance older than the latest one, import the cluster management project via URL from `https://gitlab.com/gitlab-org/project-templates/cluster-management.git`.
+1. Go to the project associated with your cluster.
+1. In your cluster's configuration page [set the cluster management project](management_project.md#selecting-a-cluster-management-project) that you just created.
 1. Detect apps deployed through Helm v2 releases by using the pre-configured [`.gitlab-ci.yml`](management_project_template.md#the-gitlab-ciyml-file) file:
     - In case you had overwritten the default GitLab Managed Apps namespace, edit `.gitlab-ci.yml`,
       and make sure the script is receiving the correct namespace as an argument:
@@ -93,3 +103,8 @@ The [GitLab Managed Apps](applications.md) are deprecated in GitLab 14.0. To mig
 
 After getting a successful pipeline, repeat these steps for any other deployed apps
 you want to manage with the Cluster Management Project.
+
+## Live examples
+
+- [Migrating from scratch using a brand new cluster management project](https://youtu.be/jCUFGWT0jS0). Also covers Helm v2 apps migration.
+- [Migrating from an existing GitLab managed apps CI/CD project](https://youtu.be/U2lbBGZjZmc)