.gitlab-ci.yml

@@ -16,7 +16,7 @@ stages:
 # in cases where jobs require Docker-in-Docker, the job
 # definition must be extended with `.use-docker-in-docker`
 default:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36
   tags:
     - gitlab-org
   # All jobs are interruptible by default
@@ -96,6 +96,9 @@ variables:
   # Default latest tag for particular branch
   QA_IMAGE_BRANCH: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_COMMIT_REF_SLUG}"
 
+  REGISTRY_HOST: "registry.gitlab.com"
+  REGISTRY_GROUP: "gitlab-org"
+
   # Preparing custom clone path to reduce space used by all random forks
   # on GitLab.com's Shared Runners. Our main forks - especially the security
   # ones - will have this variable overwritten in the project settings, so that

.gitlab/ci/frontend.gitlab-ci.yml

@@ -11,7 +11,7 @@
     - .default-retry
     - .default-before_script
     - .assets-compile-cache
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-git-2.33-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7-git-2.33-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36
   variables:
     SETUP_DB: "false"
     WEBPACK_VENDOR_DLL: "true"
@@ -331,7 +331,7 @@ bundle-size-review:
   extends:
     - .default-retry
     - .frontend:rules:bundle-size-review
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:danger
   stage: test
   needs: ["compile-production-assets"]
   script:

.gitlab/ci/global.gitlab-ci.yml

@@ -213,7 +213,7 @@
     - *storybook-node-modules-cache-push
 
 .use-pg11:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36
   services:
     - name: postgres:11.6
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -222,7 +222,7 @@
     POSTGRES_HOST_AUTH_METHOD: trust
 
 .use-pg12:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36
   services:
     - name: postgres:12
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -231,7 +231,7 @@
     POSTGRES_HOST_AUTH_METHOD: trust
 
 .use-pg13:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-13-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-13-graphicsmagick-1.3.36
   services:
     - name: postgres:13
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -240,7 +240,7 @@
     POSTGRES_HOST_AUTH_METHOD: trust
 
 .use-pg11-ee:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36
   services:
     - name: postgres:11.6
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -251,7 +251,7 @@
     POSTGRES_HOST_AUTH_METHOD: trust
 
 .use-pg12-ee:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36
   services:
     - name: postgres:12
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -262,7 +262,7 @@
     POSTGRES_HOST_AUTH_METHOD: trust
 
 .use-pg13-ee:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-13-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-13-graphicsmagick-1.3.36
   services:
     - name: postgres:13
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -274,7 +274,7 @@
 
 .use-kaniko:
   image:
-    name: registry.gitlab.com/gitlab-org/gitlab-build-images:kaniko
+    name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:kaniko
     entrypoint: [""]
   before_script:
     - source scripts/utils.sh

.gitlab/ci/rails.gitlab-ci.yml

@@ -488,6 +488,11 @@ rspec:coverage:
     - rspec unit pg12 minimal
     - rspec integration pg12 minimal
     - rspec system pg12 minimal
+    # FOSS/EE decomposed jobs
+    - rspec migration pg12 decomposed
+    - rspec unit pg12 decomposed
+    - rspec integration pg12 decomposed
+    - rspec system pg12 decomposed
     # EE jobs
     - rspec-ee migration pg12
     - rspec-ee unit pg12
@@ -498,6 +503,11 @@ rspec:coverage:
     - rspec-ee unit pg12 minimal
     - rspec-ee integration pg12 minimal
     - rspec-ee system pg12 minimal
+    # EE decomposed jobs
+    - rspec-ee migration pg12 decomposed
+    - rspec-ee unit pg12 decomposed
+    - rspec-ee integration pg12 decomposed
+    - rspec-ee system pg12 decomposed
     # Geo jobs
     - rspec-ee unit pg12 geo
     - rspec-ee integration pg12 geo

.gitlab/ci/review-apps/main.gitlab-ci.yml

@@ -34,7 +34,7 @@ review-build-cng:
 .review-workflow-base:
   extends:
     - .default-retry
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-helm3.5-kubectl1.17
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:gitlab-helm3.5-kubectl1.17
   resource_group: "review/${CI_COMMIT_REF_NAME}"
   variables:
     HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"

.gitlab/ci/review.gitlab-ci.yml

@@ -2,7 +2,7 @@ review-cleanup:
   extends:
     - .default-retry
     - .review:rules:review-cleanup
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-helm3-kubectl1.14
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:gitlab-helm3-kubectl1.14
   stage: prepare
   environment:
     name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY}

.gitlab/ci/static-analysis.gitlab-ci.yml

@@ -53,7 +53,7 @@ generate-apollo-graphl-schema:
     - .static-analysis-base
     - .frontend:rules:default-frontend-jobs
   image:
-    name: registry.gitlab.com/gitlab-org/gitlab-build-images:apollo
+    name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:apollo
     entrypoint: [""]
   needs: ['graphql-schema-dump']
   variables:

.gitlab/ci/workhorse.gitlab-ci.yml

@@ -22,8 +22,8 @@ workhorse:verify:
 
 workhorse:test using go 1.16:
   extends: .workhorse:test
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.16-git-2.31
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7-golang-1.16-git-2.31
 
 workhorse:test using go 1.17:
   extends: .workhorse:test
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.17-git-2.31
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7-golang-1.17-git-2.31

.rubocop_todo.yml

@@ -289,17 +289,6 @@ Performance/DeleteSuffix:
     - 'ee/app/models/geo/upload_registry.rb'
     - 'ee/app/workers/geo/file_download_dispatch_worker/attachment_job_finder.rb'
 
-# Offense count: 13
-# Cop supports --auto-correct.
-Performance/Detect:
-  Exclude:
-    - 'ee/spec/controllers/projects/dependencies_controller_spec.rb'
-    - 'ee/spec/requests/api/dependencies_spec.rb'
-    - 'qa/qa/runtime/feature.rb'
-    - 'spec/lib/gitlab/git/tree_spec.rb'
-    - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
-    - 'spec/models/event_spec.rb'
-
 # Offense count: 121
 Performance/MethodObjectAsBlock:
   Enabled: false
@@ -827,11 +816,6 @@ Style/RescueModifier:
 Style/SingleArgumentDig:
   Enabled: false
 
-# Offense count: 45
-# Cop supports --auto-correct.
-Style/SlicingWithRange:
-  Enabled: false
-
 # Offense count: 63
 # Configuration parameters: AllowModifier.
 Style/SoleNestedConditional:

.rubocop_todo/style/open_struct_use.yml

@@ -2,10 +2,8 @@
 Style/OpenStructUse:
   Exclude:
   - app/helpers/application_settings_helper.rb
-  - ee/spec/db/production/license_spec.rb
   - ee/spec/features/projects/new_project_spec.rb
   - ee/spec/finders/template_finder_spec.rb
-  - ee/spec/graphql/ee/resolvers/board_lists_resolver_spec.rb
   - ee/spec/helpers/ee/blob_helper_spec.rb
   - ee/spec/lib/gitlab/auth/group_saml/failure_handler_spec.rb
   - ee/spec/lib/gitlab/legacy_github_import/project_creator_spec.rb
@@ -15,7 +13,6 @@ Style/OpenStructUse:
   - lib/gitlab/testing/request_inspector_middleware.rb
   - lib/mattermost/session.rb
   - spec/controllers/groups/clusters_controller_spec.rb
-  - spec/controllers/import/fogbugz_controller_spec.rb
   - spec/controllers/import/gitlab_controller_spec.rb
   - spec/controllers/projects/clusters_controller_spec.rb
   - spec/factories/go_module_versions.rb
@@ -34,7 +31,6 @@ Style/OpenStructUse:
   - spec/lib/gitlab/database/migrations/runner_spec.rb
   - spec/lib/gitlab/gitaly_client/blobs_stitcher_spec.rb
   - spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb
-  - spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb
   - spec/lib/gitlab/legacy_github_import/project_creator_spec.rb
   - spec/lib/gitlab/quick_actions/command_definition_spec.rb
   - spec/models/design_management/design_action_spec.rb

GITALY_SERVER_VERSION

-bba495c8c929b75f8cbcdc6d07d07431736aa8d1
+0e0aeb5ca4488903f41acd392911bd89d1ad3d6d

Gemfile.lock

@@ -906,7 +906,7 @@ GEM
     orm_adapter (0.5.0)
     os (1.1.1)
     parallel (1.20.1)
-    parser (3.0.2.0)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
     parslet (1.8.2)
     pastel (0.8.0)

app/assets/javascripts/ci_lint/components/ci_lint.vue

 <script>
 import { GlButton, GlFormCheckbox, GlIcon, GlLink, GlAlert } from '@gitlab/ui';
 import CiLintResults from '~/pipeline_editor/components/lint/ci_lint_results.vue';
-import lintCiMutation from '~/pipeline_editor/graphql/mutations/lint_ci.mutation.graphql';
+import lintCiMutation from '~/pipeline_editor/graphql/mutations/client/lint_ci.mutation.graphql';
 import SourceEditor from '~/vue_shared/components/source_editor.vue';
 
 export default {

app/assets/javascripts/ide/services/index.js

@@ -3,7 +3,7 @@ import Api from '~/api';
 import dismissUserCallout from '~/graphql_shared/mutations/dismiss_user_callout.mutation.graphql';
 import axios from '~/lib/utils/axios_utils';
 import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility';
-import ciConfig from '~/pipeline_editor/graphql/queries/ci_config.graphql';
+import ciConfig from '~/pipeline_editor/graphql/queries/ci_config.query.graphql';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { query, mutate } from './gql';
 

app/assets/javascripts/import_entities/import_groups/components/import_table.vue

@@ -314,9 +314,8 @@ export default {
           variables: { importRequests },
         });
       } catch (error) {
-        const message = error?.networkError?.response?.data?.error ?? i18n.ERROR_IMPORT;
         createFlash({
-          message,
+          message: i18n.ERROR_IMPORT,
           captureError: true,
           error,
         });

app/assets/javascripts/import_entities/import_groups/components/import_target_cell.vue

@@ -32,72 +32,84 @@ export default {
     fullPath() {
       return this.group.importTarget.targetNamespace.fullPath || s__('BulkImport|No parent');
     },
-    invalidNameValidationMessage() {
-      return getInvalidNameValidationMessage(this.group.importTarget);
+    validationMessage() {
+      return (
+        this.group.progress?.message || getInvalidNameValidationMessage(this.group.importTarget)
+      );
+    },
+    validNameState() {
+      // bootstrap-vue requires null for "indifferent" state, if we return true
+      // this will highlight field in green like "passed validation"
+      return this.group.flags.isInvalid && this.group.flags.isAvailableForImport ? false : null;
     },
   },
 };
 </script>
 
 <template>
-  <div class="gl-display-flex gl-align-items-stretch">
-    <import-group-dropdown
-      #default="{ namespaces }"
-      :text="fullPath"
-      :disabled="!group.flags.isAvailableForImport"
-      :namespaces="availableNamespaces"
-      toggle-class="gl-rounded-top-right-none! gl-rounded-bottom-right-none!"
-      class="gl-h-7 gl-flex-grow-1"
-      data-qa-selector="target_namespace_selector_dropdown"
-    >
-      <gl-dropdown-item @click="$emit('update-target-namespace', { fullPath: '', id: null })">{{
-        s__('BulkImport|No parent')
-      }}</gl-dropdown-item>
-      <template v-if="namespaces.length">
-        <gl-dropdown-divider />
-        <gl-dropdown-section-header>
-          {{ s__('BulkImport|Existing groups') }}
-        </gl-dropdown-section-header>
-        <gl-dropdown-item
-          v-for="ns in namespaces"
-          :key="ns.fullPath"
-          data-qa-selector="target_group_dropdown_item"
-          :data-qa-group-name="ns.fullPath"
-          @click="$emit('update-target-namespace', ns)"
-        >
-          {{ ns.fullPath }}
-        </gl-dropdown-item>
-      </template>
-    </import-group-dropdown>
-    <div
-      class="gl-h-7 gl-px-3 gl-display-flex gl-align-items-center gl-border-solid gl-border-0 gl-border-t-1 gl-border-b-1 gl-bg-gray-10"
-      :class="{
-        'gl-text-gray-400 gl-border-gray-100': !group.flags.isAvailableForImport,
-        'gl-border-gray-200': group.flags.isAvailableForImport,
-      }"
-    >
-      /
-    </div>
-    <div class="gl-flex-grow-1">
-      <gl-form-input
-        class="gl-rounded-top-left-none gl-rounded-bottom-left-none"
+  <div>
+    <div class="gl-display-flex gl-align-items-stretch">
+      <import-group-dropdown
+        #default="{ namespaces }"
+        :text="fullPath"
+        :disabled="!group.flags.isAvailableForImport"
+        :namespaces="availableNamespaces"
+        toggle-class="gl-rounded-top-right-none! gl-rounded-bottom-right-none!"
+        class="gl-h-7 gl-flex-grow-1"
+        data-qa-selector="target_namespace_selector_dropdown"
+      >
+        <gl-dropdown-item @click="$emit('update-target-namespace', { fullPath: '', id: null })">{{
+          s__('BulkImport|No parent')
+        }}</gl-dropdown-item>
+        <template v-if="namespaces.length">
+          <gl-dropdown-divider />
+          <gl-dropdown-section-header>
+            {{ s__('BulkImport|Existing groups') }}
+          </gl-dropdown-section-header>
+          <gl-dropdown-item
+            v-for="ns in namespaces"
+            :key="ns.fullPath"
+            data-qa-selector="target_group_dropdown_item"
+            :data-qa-group-name="ns.fullPath"
+            @click="$emit('update-target-namespace', ns)"
+          >
+            {{ ns.fullPath }}
+          </gl-dropdown-item>
+        </template>
+      </import-group-dropdown>
+      <div
+        class="gl-h-7 gl-px-3 gl-display-flex gl-align-items-center gl-border-solid gl-border-0 gl-border-t-1 gl-border-b-1 gl-bg-gray-10"
         :class="{
-          'gl-inset-border-1-gray-200!': group.flags.isAvailableForImport,
-          'gl-inset-border-1-gray-100!': !group.flags.isAvailableForImport,
-          'is-invalid': group.flags.isInvalid && group.flags.isAvailableForImport,
+          'gl-text-gray-400 gl-border-gray-100': !group.flags.isAvailableForImport,
+          'gl-border-gray-200': group.flags.isAvailableForImport,
         }"
-        debounce="500"
-        :disabled="!group.flags.isAvailableForImport"
-        :value="group.importTarget.newName"
-        :aria-label="__('New name')"
-        @input="$emit('update-new-name', $event)"
-      />
-      <p
-        v-if="group.flags.isAvailableForImport && group.flags.isInvalid"
-        class="gl-text-red-500 gl-m-0 gl-mt-2"
       >
-        {{ invalidNameValidationMessage }}
-      </p>
+        /
+      </div>
+      <div class="gl-flex-grow-1">
+        <gl-form-input
+          class="gl-rounded-top-left-none gl-rounded-bottom-left-none"
+          :class="{
+            'gl-inset-border-1-gray-200!':
+              group.flags.isAvailableForImport && !group.flags.isInvalid,
+            'gl-inset-border-1-gray-100!':
+              !group.flags.isAvailableForImport && !group.flags.isInvalid,
+          }"
+          debounce="500"
+          :disabled="!group.flags.isAvailableForImport"
+          :value="group.importTarget.newName"
+          :aria-label="__('New name')"
+          :state="validNameState"
+          @input="$emit('update-new-name', $event)"
+        />
+      </div>
+    </div>
+    <div
+      v-if="group.flags.isAvailableForImport && (group.flags.isInvalid || validationMessage)"
+      class="gl-text-red-500 gl-m-0 gl-mt-2"
+      role="alert"
+    >
+      {{ validationMessage }}
     </div>
   </div>
 </template>

app/assets/javascripts/import_entities/import_groups/graphql/client_factory.js

@@ -142,9 +142,7 @@ export function createResolvers({ endpoints }) {
           };
         });
 
-        const {
-          data: { id: jobId },
-        } = await axios.post(endpoints.createBulkImport, {
+        const { data: originalResponse } = await axios.post(endpoints.createBulkImport, {
           bulk_import: importOperations.map((op) => ({
             source_type: 'group_entity',
             source_full_path: op.group.fullPath,
@@ -153,15 +151,21 @@ export function createResolvers({ endpoints }) {
           })),
         });
 
-        return importOperations.map((op) => {
+        const responses = Array.isArray(originalResponse)
+          ? originalResponse
+          : [{ success: true, id: originalResponse.id }];
+
+        return importOperations.map((op, idx) => {
+          const response = responses[idx];
           const lastImportTarget = {
             targetNamespace: op.targetNamespace,
             newName: op.newName,
           };
 
           const progress = {
-            id: jobId,
-            status: STATUSES.CREATED,
+            id: response.id || `local-${Date.now()}-${idx}`,
+            status: response.success ? STATUSES.CREATED : STATUSES.FAILED,
+            message: response.message || null,
           };
 
           localStorageCache.set(op.group.webUrl, { progress, lastImportTarget });

app/assets/javascripts/import_entities/import_groups/graphql/fragments/bulk_import_source_group_progress.fragment.graphql

 fragment BulkImportSourceGroupProgress on ClientBulkImportProgress {
   id
   status
+  message
 }

app/assets/javascripts/import_entities/import_groups/graphql/mutations/import_groups.mutation.graphql

@@ -9,6 +9,7 @@ mutation importGroups($importRequests: [ImportGroupInput!]!) {
     progress {
       id
       status
+      message
     }
   }
 }

app/assets/javascripts/import_entities/import_groups/graphql/services/local_storage_cache.js

@@ -22,7 +22,14 @@ export class LocalStorageCache {
 
   loadCacheFromStorage() {
     try {
-      return JSON.parse(this.storage.getItem(KEY)) ?? {};
+      const storage = JSON.parse(this.storage.getItem(KEY)) ?? {};
+      Object.values(storage).forEach((entry) => {
+        if (entry.progress && !('message' in entry.progress)) {
+          // eslint-disable-next-line no-param-reassign
+          entry.progress.message = '';
+        }
+      });
+      return storage;
     } catch {
       return {};
     }