Add latest changes from gitlab-org/gitlab@master

3 files changed, 21 insertions, 15 deletions

diff --git a/doc/integration/README.md b/doc/integration/README.md
deleted file mode 100644
index 7c03b957686..00000000000
--- a/doc/integration/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: 'index.md'
-remove_date: '2021-07-30'
----
-
-This document was moved to [another location](index.md).
-
-<!-- This redirect file can be deleted after <2021-07-30>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/integration/gitpod.md b/doc/integration/gitpod.md
index c5af8511630..e3cd3075bc9 100644
--- a/doc/integration/gitpod.md
+++ b/doc/integration/gitpod.md
@@ -17,7 +17,9 @@ your Git branches like a CI/CD server.
 
 This means you don't have to wait for dependencies to be downloaded and builds to finish, you can start
 coding immediately. With Gitpod you can start coding instantly on any project, branch, and merge
-request from any device, at any time.
+request from any device, at any time, from your browser:
+
+![Gitpod interface](img/gitpod_web_interface_v13_4.png)
 
 To use the GitLab Gitpod integration, it must be enabled for your GitLab instance. Users of:
 
@@ -56,11 +58,24 @@ Your users can then [enable it for themselves](#enable-gitpod-in-your-user-setti
 
 ## Launch Gitpod in GitLab
 
-You can launch Gitpod directly from GitLab by clicking the **Gitpod** button from the **Web IDE**
-dropdown on the project page:
+You can launch Gitpod directly from GitLab in one of these ways:
 
-![Gitpod Button on Project Page](img/gitpod_button_project_page_v13_4.png)
+- *From your project's page:*
+  1. Go to your project, and navigate to the page you want to edit.
+  1. Select the caret **(angle-down)** next to **Web IDE**, and select **Gitpod**
+     from the list:
 
-A project launched in GitLab looks like:
+     ![Gitpod Button on Project Page](img/gitpod_button_project_page_v13_4.png)
 
-![Gitpod interface](img/gitpod_web_interface_v13_4.png)
+  1. Select **Open in Gitpod**.
+- *From a merge request:*
+  1. Go to your merge request, and select **Overview** in the tab menu.
+  1. Scroll to the end of the merge request description.
+  1. Select the caret **(angle-down)** next to **Web IDE**, then select **Gitpod**
+     from the list:
+
+     ![Gitpod button on the merge request page](img/gitpod-button_v14_2.png)
+
+  1. Select **Open in Gitpod**.
+
+Gitpod builds your development environment for your branch.
diff --git a/doc/integration/img/gitpod-button_v14_2.png b/doc/integration/img/gitpod-button_v14_2.png
new file mode 100644
index 00000000000..04dd5b50a7f
--- /dev/null
+++ b/doc/integration/img/gitpod-button_v14_2.png