Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'doc/integration/gitpod.md')
-rw-r--r--doc/integration/gitpod.md19
1 files changed, 9 insertions, 10 deletions
diff --git a/doc/integration/gitpod.md b/doc/integration/gitpod.md
index 0088d4b886d..ee8f46e73df 100644
--- a/doc/integration/gitpod.md
+++ b/doc/integration/gitpod.md
@@ -5,12 +5,12 @@ group: Editor
info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments"
---
-# Gitpod integration **(FREE)**
+# Gitpod **(FREE)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/228893) in GitLab 13.4.
> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/258206) in GitLab 13.8
-With [Gitpod](https://gitpod.io/) you can describe your development environment as code to get fully
+With [Gitpod](https://www.gitpod.io/), you can describe your development environment as code to get fully
set up, compiled, and tested development environments for any GitLab project. The development
environments are not only automated but also prebuilt which means that Gitpod continuously builds
your Git branches like a CI/CD server.
@@ -28,33 +28,32 @@ To use the GitLab Gitpod integration, it must be enabled for your GitLab instanc
1. It's [enabled and configured by a GitLab administrator](#configure-a-self-managed-instance).
1. It's [enabled in their user settings](#enable-gitpod-in-your-user-settings).
-To learn more about Gitpod, see their [features](https://www.gitpod.io/) and
+For more information about Gitpod, see the Gitpod [features](https://www.gitpod.io/) and
[documentation](https://www.gitpod.io/docs/).
## Enable Gitpod in your user settings
With the Gitpod integration enabled for your GitLab instance, to enable it for yourself:
-1. In the top-right corner, select your avatar.
+1. In the upper-right corner, select your avatar.
1. Select **Preferences**.
1. Under **Preferences**, locate the **Integrations** section.
1. Select the **Enable Gitpod integration** checkbox and select **Save changes**.
## Configure a self-managed instance **(FREE SELF)**
-For GitLab self-managed instances, a GitLab administrator needs to:
+For self-managed GitLab instances, a GitLab administrator must:
-1. Set up a Gitpod instance to integrate with GitLab. Refer to the [Gitpod documentation](https://www.gitpod.io/docs/configure/self-hosted/latest)
- to get your instance up and running.
-1. Enable it in GitLab:
+1. Enable the Gitpod integration in GitLab:
1. On the top bar, select **Main menu > Admin**.
1. On the left sidebar, select **Settings > General**.
1. Expand the **Gitpod** configuration section.
1. Select the **Enable Gitpod integration** checkbox.
- 1. Add your Gitpod instance URL (for example, `https://gitpod.example.com`).
+ 1. Enter the Gitpod instance URL (for example, `https://gitpod.example.com` or `https://gitpod.io`).
1. Select **Save changes**.
+1. Register the self-managed GitLab instance in Gitpod. For more information, see the [Gitpod documentation](https://www.gitpod.io/docs/configure/authentication/gitlab#registering-a-self-hosted-gitlab-installation).
-Your users can then [enable it for themselves](#enable-gitpod-in-your-user-settings).
+GitLab users can then [enable the Gitpod integration for themselves](#enable-gitpod-in-your-user-settings).
## Launch Gitpod in GitLab