Add latest changes from gitlab-org/gitlab@master

6 files changed, 29 insertions, 41 deletions

diff --git a/app/assets/javascripts/invite_members/components/invite_members_modal.vue b/app/assets/javascripts/invite_members/components/invite_members_modal.vue
index d510e382e05..41f1389400a 100644
--- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue
+++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue
@@ -1,8 +1,7 @@
 <script>
 import {
   GlAlert,
-  GlDropdown,
-  GlDropdownItem,
+  GlCollapsibleListbox,
   GlLink,
   GlSprintf,
   GlFormCheckboxGroup,
@@ -40,8 +39,7 @@ export default {
   components: {
     GlAlert,
     GlLink,
-    GlDropdown,
-    GlDropdownItem,
+    GlCollapsibleListbox,
     GlSprintf,
     GlFormCheckboxGroup,
     GlButton,
@@ -124,6 +122,7 @@ export default {
       invalidMembers: {},
       selectedTasksToBeDone: [],
       selectedTaskProject: this.projects[0],
+      selectedTaskProjectId: this.projects[0]?.id,
       source: 'unknown',
       mode: 'default',
       // Kept in sync with "base"
@@ -131,6 +130,7 @@ export default {
       errorsLimit: 2,
       isErrorsSectionExpanded: false,
       shouldShowEmptyInvitesAlert: false,
+      projectsForDropdown: this.projects.map((p) => ({ value: p.id, text: p.title, ...p })),
     };
   },
   computed: {
@@ -347,8 +347,8 @@ export default {
       this.selectedTasksToBeDone = [];
       [this.selectedTaskProject] = this.projects;
     },
-    changeSelectedTaskProject(project) {
-      this.selectedTaskProject = project;
+    changeSelectedTaskProject(projectId) {
+      this.selectedTaskProject = this.projects.find((project) => project.id === projectId);
     },
     onInviteSuccess() {
       if (this.reloadPageOnSubmit) {
@@ -514,23 +514,14 @@ export default {
             <label class="gl-mt-5 gl-display-block">
               {{ $options.labels.tasksProject.title }}
             </label>
-            <gl-dropdown
+            <gl-collapsible-listbox
+              v-model="selectedTaskProjectId"
+              :items="projectsForDropdown"
+              :block="true"
               class="gl-w-half gl-xs-w-full"
-              :text="selectedTaskProject.title"
               data-testid="invite-members-modal-project-select"
-            >
-              <template v-for="project in projects">
-                <gl-dropdown-item
-                  :key="project.id"
-                  active-class="is-active"
-                  is-check-item
-                  :is-checked="project.id === selectedTaskProject.id"
-                  @click="changeSelectedTaskProject(project)"
-                >
-                  {{ project.title }}
-                </gl-dropdown-item>
-              </template>
-            </gl-dropdown>
+              @select="changeSelectedTaskProject"
+            />
           </template>
         </template>
         <gl-alert
diff --git a/doc/integration/gitpod.md b/doc/integration/gitpod.md
index 0088d4b886d..737a67e2fe4 100644
--- a/doc/integration/gitpod.md
+++ b/doc/integration/gitpod.md
@@ -10,7 +10,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 > - [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.
@@ -42,19 +42,18 @@ With the Gitpod integration enabled for your GitLab instance, to enable it for y
 
 ## 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. Add 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
 
diff --git a/doc/policy/alpha-beta-support.md b/doc/policy/alpha-beta-support.md
index 5a7c1962d12..1c7e9e77751 100644
--- a/doc/policy/alpha-beta-support.md
+++ b/doc/policy/alpha-beta-support.md
@@ -19,7 +19,7 @@ Characteristics of Alpha features:
 - Not ready for production use.
 - Unstable and can cause performance and stability issues.
 - Configuration and dependencies are likely to change.
-- Features and functions may be removed.
+- Features and functions may be removed. Breaking changes may occur outside of major releases or with less notice than for Beta or Generally Available features.
 - Data loss can occur (be that through bugs or updates).
 - Documentation reflects the Alpha status.
 - Behind flags that are off by default.
@@ -36,7 +36,7 @@ Closed Beta features are available to selected users only.
 - Not ready for production use.
 - Unstable and can cause performance and stability issues.
 - Configuration and dependencies unlikely to change.
-- Features and functions unlikely to change.
+- Features and functions unlikely to change. However, breaking changes may occur outside of major releases or with less notice than for Generally Available features.
 - Data loss less likely.
 - Behind a feature flag that is off by default and the UI reflects Beta status.
 - Documentation reflects Beta status.
@@ -47,7 +47,7 @@ Closed Beta features are available to selected users only.
 - Not ready for production use.
 - Unstable and can cause performance and stability issues.
 - Configuration and dependencies unlikely to change.
-- Features and functions unlikely to change.
+- Features and functions unlikely to change. However, breaking changes may occur outside of major releases or with less notice than for Generally Available features.
 - Data loss not likely.
 - Support on a commercially-reasonable effort basis.
 - Documentation reflects Beta status.
diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md
index 026e5acd6cb..5f082476a92 100644
--- a/doc/user/group/manage.md
+++ b/doc/user/group/manage.md
@@ -350,6 +350,7 @@ When transferring groups, note:
 - If the immediate parent group's visibility is lower than the group's current visibility, visibility levels for subgroups and projects change to match the new parent group's visibility.
 - Only explicit group membership is transferred, not inherited membership. If the group's owners have only inherited membership, this leaves the group without an owner. In this case, the user transferring the group becomes the group's owner.
 - Transfers fail if [packages](../packages/index.md) exist in any of the projects in the group, or in any of its subgroups.
+- Top-level groups that have a subscription on GitLab.com cannot be transferred. To make the transfer possible, the top-level group's subscription must be removed first. Then the top-level group can be transferred as a subgroup to another top-level group.
 
 To transfer a group:
 
diff --git a/doc/user/project/deploy_tokens/index.md b/doc/user/project/deploy_tokens/index.md
index 5f279ddda5b..0b005256d58 100644
--- a/doc/user/project/deploy_tokens/index.md
+++ b/doc/user/project/deploy_tokens/index.md
@@ -6,10 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Deploy tokens **(FREE)**
 
-> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/199370) from **Settings > Repository** to **Settings > CI/CD** in GitLab 12.9.
-> - [Added](https://gitlab.com/gitlab-org/gitlab/-/issues/22743) `write_registry` scope in GitLab 12.10.
-> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29280) from **Settings > CI/CD** to **Settings > Repository** in GitLab 12.10.1.
-> - [Added](https://gitlab.com/gitlab-org/gitlab/-/issues/213566) package registry scopes in GitLab 13.0.
+> [Added](https://gitlab.com/gitlab-org/gitlab/-/issues/213566) package registry scopes in GitLab 13.0.
 
 You can use a deploy token to enable authentication of deployment tasks, independent of a user
 account. In most cases you use a deploy token from an external host, like a build server or CI/CD
@@ -185,7 +182,7 @@ nuget source Add -Name GitLab -Source "https://gitlab.example.com/api/v4/project
 nuget install mypkg.nupkg
 ```
 
-## Push packages to a package repository
+## Push packages to a package registry
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213566) in GitLab 13.0.
 
diff --git a/qa/Dockerfile b/qa/Dockerfile
index 8e79d0a7bad..6efc8ac09fa 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -15,11 +15,11 @@ ENV WD_INSTALL_DIR=/usr/local/bin
 ##
 # Install system libs
 #
-RUN apt-get update; \
-    apt-get install -y xvfb unzip; \
-    apt-get -yq autoremove; \
-    apt-get clean -yqq; \
-    rm -rf /var/lib/apt/lists/*
+RUN apt-get update \
+    && apt-get install -y xvfb unzip \
+    && apt-get -yq autoremove \
+    && apt-get clean -yqq \
+    && rm -rf /var/lib/apt/lists/*
 
 ##
 # Install root certificate