.gitlab/ci/as-if-foss.gitlab-ci.yml

@@ -67,6 +67,10 @@ start-as-if-foss:
   variables:
     START_AS_IF_FOSS: $START_AS_IF_FOSS
     RUBY_VERSION: $RUBY_VERSION
+    # Fake merge request variables to make `detect-tests` work from FOSS
+    CI_MERGE_REQUEST_PROJECT_PATH: $CI_MERGE_REQUEST_PROJECT_PATH
+    CI_MERGE_REQUEST_IID: $CI_MERGE_REQUEST_IID
+    # Enabling each individual jobs
     ENABLE_RSPEC: $ENABLE_RSPEC
     ENABLE_RSPEC_FAST_SPEC_HELPER: $ENABLE_RSPEC_FAST_SPEC_HELPER
     ENABLE_RSPEC_PRAEFECT: $ENABLE_RSPEC_PRAEFECT
@@ -85,11 +89,13 @@ start-as-if-foss:
     ENABLE_COMPILE_STORYBOOK: $ENABLE_COMPILE_STORYBOOK
     ENABLE_COMPILE_TEST_ASSETS: $ENABLE_COMPILE_TEST_ASSETS
     ENABLE_CACHE_ASSETS: $ENABLE_CACHE_ASSETS
+    ENABLE_DETECT_TESTS: $ENABLE_DETECT_TESTS
     ENABLE_ESLINT: $ENABLE_ESLINT
     ENABLE_GENERATE_APOLLO_GRAPHQL_SCHEMA: $ENABLE_GENERATE_APOLLO_GRAPHQL_SCHEMA
     ENABLE_GRAPHQL_SCHEMA_DUMP: $ENABLE_GRAPHQL_SCHEMA_DUMP
     ENABLE_JEST: $ENABLE_JEST
     ENABLE_JEST_INTEGRATION: $ENABLE_JEST_INTEGRATION
+    ENABLE_RUBOCOP: $ENABLE_RUBOCOP
     ENABLE_QA_INTERNAL: $ENABLE_QA_INTERNAL
     ENABLE_QA_SELECTORS: $ENABLE_QA_SELECTORS
     ENABLE_STATIC_ANALYSIS: $ENABLE_STATIC_ANALYSIS

.gitlab/ci/build-images.gitlab-ci.yml

@@ -29,6 +29,13 @@ build-qa-image as-if-foss:
     - .as-if-foss
     - .build-images:rules:build-qa-image-as-if-foss
 
+follow-up:build-qa-image:
+  extends:
+    - build-qa-image
+    - .qa:rules:follow-up-e2e
+  needs:
+    - manual:e2e-test-pipeline-generate
+
 retag-gdk-image:
   extends:
     - .base-image-build
@@ -82,3 +89,9 @@ build-assets-image as-if-foss:
     - .as-if-foss
     - .build-images:rules:build-assets-image-as-if-foss
   needs: ["compile-production-assets as-if-foss"]
+
+follow-up:build-assets-image:
+  extends:
+    - build-assets-image
+    - .qa:rules:follow-up-e2e
+  needs: ["follow-up:compile-production-assets"]

.gitlab/ci/database.gitlab-ci.yml

@@ -58,6 +58,12 @@ db:migrate:multi-version-upgrade:
     - psql --output /dev/null -v "ON_ERROR_STOP=1" -h postgres -U postgres -d gitlabhq_test < gitlabhq_production
     - bundle exec rake gitlab:db:configure
 
+# Validate minimum PG version supported by GitLab
+db:migrate:multi-version-upgrade-pg13:
+  extends:
+    - db:migrate:multi-version-upgrade
+    - .use-pg13
+
 db:migrate:reset:
   extends: .db-job-base
   script:

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

@@ -58,6 +58,13 @@ compile-production-assets as-if-foss:
     - .as-if-foss
     - .frontend:rules:compile-production-assets-as-if-foss
 
+follow-up:compile-production-assets:
+  extends:
+    - compile-production-assets
+    - .qa:rules:follow-up-e2e
+  needs:
+    - manual:e2e-test-pipeline-generate
+
 compile-test-assets:
   extends:
     - .compile-assets-base

.gitlab/ci/qa.gitlab-ci.yml

@@ -101,11 +101,13 @@ trigger-omnibus:
     branch: $TRIGGER_BRANCH
     strategy: depend
 
-# Same as trigger-omnibus but is manual and runs follow-up-e2e:package-and-test-ee automatically right after
-trigger-omnibus-and-follow-up-e2e:
+follow-up:trigger-omnibus:
   extends:
     - trigger-omnibus
-    - .qa:rules:manual-omnibus-and-follow-up-e2e
+    - .qa:rules:follow-up-e2e
+  needs:
+    - follow-up:trigger-omnibus-env
+    - follow-up:build-assets-image
 
 trigger-omnibus as-if-foss:
   extends:
@@ -132,19 +134,15 @@ e2e:package-and-test-ee:
     QA_RUN_TYPE: e2e-package-and-test
     PIPELINE_NAME: E2E Omnibus GitLab EE
 
-# Same as e2e:package-and-test-ee but runs automatically after trigger-omnibus-and-follow-up-e2e
-follow-up-e2e:package-and-test-ee:
+# Same as e2e:package-and-test-ee but runs automatically after manual:e2e-test-pipeline-generate
+follow-up:e2e:package-and-test-ee:
   extends:
-    - .e2e-trigger-base
+    - e2e:package-and-test-ee
     - .qa:rules:follow-up-e2e
   needs:
-    - build-qa-image
-    - trigger-omnibus-and-follow-up-e2e
-    - e2e-test-pipeline-generate
-  variables:
-    RELEASE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/build/omnibus-gitlab-mirror/gitlab-ee:${RELEASE_IMAGE_TAG}"
-    QA_RUN_TYPE: e2e-package-and-test
-    PIPELINE_NAME: E2E Omnibus GitLab EE
+    - follow-up:build-qa-image
+    - follow-up:trigger-omnibus
+    - manual:e2e-test-pipeline-generate
 
 e2e:post-run-e2e-message:
   extends:

.gitlab/ci/rules.gitlab-ci.yml

@@ -155,12 +155,6 @@
 .if-dot-com-gitlab-org-merge-request: &if-dot-com-gitlab-org-merge-request
   if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && ($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached")'
 
-.if-dot-com-gitlab-org-and-security-merge-request: &if-dot-com-gitlab-org-and-security-merge-request
-  if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org/security" && ($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached")'
-
-.if-dot-com-gitlab-org-and-security-tag: &if-dot-com-gitlab-org-and-security-tag
-  if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org/security" && $CI_COMMIT_TAG'
-
 .if-ruby-branch: &if-ruby-branch
   if: '$CI_COMMIT_BRANCH =~ /^ruby\d+(_\d)*$/ || $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby\d+(_\d)*/'
 
@@ -876,33 +870,37 @@
 ######################
 .build-images:rules:build-qa-image-merge-requests:
   rules:
-    - <<: *if-not-canonical-namespace
-      when: never
-    - <<: *if-merge-request-labels-pipeline-expedite
-      when: never
     - if: '$ENABLE_BUILD_QA_IMAGE == "true"'
+    - <<: *if-merge-request-labels-run-all-e2e
+    - <<: *if-merge-request-labels-run-review-app
+    - <<: *if-merge-request
+      changes: *qa-patterns
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
-    - <<: *if-merge-request-labels-run-review-app
     - <<: *if-merge-request
       changes: *ci-build-images-patterns
+    - <<: *if-merge-request-not-approved
+      when: never
     - <<: *if-merge-request
       changes: *code-qa-patterns
     # Rules to support .qa:rules:package-and-test-ee
     - <<: *if-merge-request
       changes: *dependency-patterns
-    - <<: *if-merge-request-labels-run-all-e2e
     - <<: *if-merge-request
       changes: *feature-flag-development-config-patterns
     - <<: *if-merge-request
       changes: *nodejs-patterns
     - <<: *if-merge-request
       changes: *ci-qa-patterns
-    - <<: *if-force-ci
 
 .build-images:rules:build-qa-image:
   rules:
-    - !reference [".build-images:rules:build-qa-image-merge-requests", "rules"]
+    - <<: *if-not-canonical-namespace
+      when: never
+    - <<: *if-merge-request-labels-pipeline-expedite
+      when: never
+    - <<: *if-ruby-branch
+    - <<: *if-force-ci
     - <<: *if-auto-deploy-branches
       variables:
         ARCH: amd64,arm64
@@ -917,16 +915,20 @@
     - <<: *if-dot-com-gitlab-org-schedule
       variables:
         ARCH: amd64,arm64
-    - <<: *if-ruby-branch
+    - !reference [".build-images:rules:build-qa-image-merge-requests", rules]
     - !reference [".releases:rules:canonical-dot-com-gitlab-stable-branch-only-setup-test-env", rules]
 
 .build-images:rules:build-qa-image-as-if-foss:
   rules:
+    - <<: *if-not-canonical-namespace
+      when: never
+    - <<: *if-merge-request-labels-pipeline-expedite
+      when: never
     - !reference [".strict-ee-only-rules", rules]
-    - !reference [".build-images:rules:build-qa-image-merge-requests", "rules"]
     - <<: *if-default-branch-schedule-nightly
       variables:
         ARCH: amd64,arm64
+    - !reference [".build-images:rules:build-qa-image-merge-requests", rules]
 
 # When new minor release tag is pushed, re-tag gdk image with pattern ignored by registry cleanup
 .build-images:rules:retag-gdk-image:
@@ -968,7 +970,7 @@
       changes: *nodejs-patterns
     - <<: *if-merge-request
       changes: *ci-qa-patterns
-    - <<: *if-dot-com-gitlab-org-and-security-merge-request
+    - <<: *if-security-merge-request
       changes: *code-patterns
     - <<: *if-merge-request
       changes: *code-qa-patterns
@@ -1194,19 +1196,19 @@
     - <<: *if-auto-deploy-branches
     - <<: *if-ruby-branch
     - <<: *if-force-ci
-    # Rules to support .qa:rules:package-and-test
-    - <<: *if-default-branch-schedule-nightly
     - <<: *if-merge-request-labels-run-all-e2e
     - <<: *if-merge-request-labels-run-review-app
+    - <<: *if-merge-request
+      changes: *qa-patterns
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
     - <<: *if-default-refs
       changes: *ci-build-images-patterns
     - <<: *if-default-refs
       changes: *workhorse-patterns
-    # TODO: Below are broad so we only want to run if it's approved if it's MR
-    # - <<: *if-merge-request-not-approved
-    #   when: never
+    - <<: *if-merge-request-not-approved
+      when: never
+    # Rules to support .qa:rules:package-and-test
     - <<: *if-merge-request
       changes: *dependency-patterns
     - <<: *if-default-refs
@@ -1490,6 +1492,10 @@
       when: never
     - <<: *if-merge-request-labels-pipeline-expedite
       when: never
+    - <<: *if-ruby-branch
+      allow_failure: true
+    - <<: *if-merge-request-labels-run-all-e2e
+      allow_failure: true
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
       allow_failure: true
@@ -1501,13 +1507,10 @@
       allow_failure: true
     - <<: *if-dot-com-gitlab-org-schedule
       allow_failure: true
-    - <<: *if-ruby-branch
     # Rules to support .qa:rules:package-and-test-ee
     - <<: *if-merge-request
       changes: *dependency-patterns
       allow_failure: true
-    - <<: *if-merge-request-labels-run-all-e2e
-      allow_failure: true
     - <<: *if-merge-request
       changes: *feature-flag-development-config-patterns
       allow_failure: true
@@ -1525,16 +1528,18 @@
   rules:
     # From .qa:rules:package-and-test-common
     - !reference [".qa:rules:package-and-test-never-run", rules]
-    - <<: *if-merge-request-targeting-stable-branch
-      changes: *setup-test-env-patterns
     - <<: *if-ruby-branch
+    - <<: *if-merge-request-labels-run-all-e2e
     - <<: *if-merge-request
       changes: *qa-patterns
+    - <<: *if-merge-request-targeting-stable-branch
+      changes: *setup-test-env-patterns
+    - <<: *if-merge-request-not-approved
+      when: never
     - <<: *if-merge-request
       changes: *dependency-patterns
       variables:
         OMNIBUS_GITLAB_BUILD_ON_ALL_OS: 'true'
-    - <<: *if-merge-request-labels-run-all-e2e
     - <<: *if-merge-request
       changes: *feature-flag-development-config-patterns
     - <<: *if-merge-request
@@ -1543,11 +1548,11 @@
       changes: *nodejs-patterns
     - <<: *if-merge-request
       changes: *ci-qa-patterns
-    - <<: *if-dot-com-gitlab-org-and-security-merge-request
+    - <<: *if-security-merge-request
       changes: *code-patterns
-    - <<: *if-force-ci
     - <<: *if-merge-request-and-specific-devops-stage
       changes: *code-patterns
+    - <<: *if-force-ci
     # From .qa:rules:package-and-test-schedule
     - <<: *if-dot-com-gitlab-org-schedule
     - !reference [".qa:rules:code-merge-request", rules]
@@ -1564,15 +1569,17 @@
 .qa:rules:package-and-test-common:
   rules:
     - !reference [".qa:rules:package-and-test-never-run", rules]
-    - <<: *if-merge-request-targeting-stable-branch
-      changes: *setup-test-env-patterns
-      allow_failure: true
     - <<: *if-ruby-branch
       allow_failure: true
+    - <<: *if-merge-request-labels-run-all-e2e
+      allow_failure: true
     # Run tests automatically for MRs that touch QA files
     - <<: *if-merge-request
       changes: *qa-patterns
       allow_failure: true
+    - <<: *if-merge-request-targeting-stable-branch
+      changes: *setup-test-env-patterns
+      allow_failure: true
     # Otherwise, only run tests after the MR is approved
     - <<: *if-merge-request-not-approved
       when: never
@@ -1580,8 +1587,6 @@
       changes: *dependency-patterns
       variables:
         OMNIBUS_GITLAB_BUILD_ON_ALL_OS: 'true'
-    - <<: *if-merge-request-labels-run-all-e2e
-      allow_failure: true
     - <<: *if-merge-request
       changes: *feature-flag-development-config-patterns
       allow_failure: true
@@ -1594,15 +1599,15 @@
     - <<: *if-merge-request
       changes: *ci-qa-patterns
       allow_failure: true
-    - <<: *if-dot-com-gitlab-org-and-security-merge-request
+    - <<: *if-security-merge-request
       changes: *code-patterns
       allow_failure: true
-    - <<: *if-force-ci
-      when: manual
-      allow_failure: true
     - <<: *if-merge-request-and-specific-devops-stage
       changes: *code-patterns
       allow_failure: true
+    - <<: *if-force-ci
+      when: manual
+      allow_failure: true
       # We used to have a rule at the end here that would catch any remaining code MRs and allow the job to be run
       # manually. That rule is now in ".qa:rules:code-merge-request-manual" so it can be included when needed and we can
       # still use ".qa:rules:package-and-test-common" in jobs we don't want to be manual.
@@ -1673,10 +1678,8 @@
       changes: *code-patterns
 
 # Note: If any changes are made to this rule, the following should also be updated:
-# 1) .qa:rules:manual-omnibus-and-follow-up-e2e
-# 2) .qa:rules:follow-up-e2e
-# 3) .qa:rules:trigger-omnibus-env
-# 4) .qa:rules:post-run-e2e-message
+# 1) .qa:rules:trigger-omnibus-env
+# 2) .qa:rules:post-run-e2e-message
 .qa:rules:package-and-test-ee:
   rules:
     - !reference [".qa:rules:package-and-test-common", rules]
@@ -1686,12 +1689,14 @@
 .qa:rules:package-and-test-ce:
   rules:
     - !reference [".qa:rules:package-and-test-never-run", rules]
-    - <<: *if-dot-com-gitlab-org-and-security-merge-request
-      changes: *ci-build-images-patterns
+    - <<: *if-security-merge-request
+      changes: *qa-patterns
       when: manual
       allow_failure: true
-    - <<: *if-dot-com-gitlab-org-and-security-merge-request
-      changes: *code-qa-patterns
+    - <<: *if-merge-request-not-approved
+      when: never
+    - <<: *if-security-merge-request
+      changes: *code-patterns
       when: manual
       allow_failure: true
     - <<: *if-default-branch-schedule-nightly
@@ -1740,18 +1745,18 @@
     - !reference [".qa:rules:package-and-test-nightly", rules]
     - !reference [".qa:rules:package-and-test-ce", rules]
 
-# These are based on `.qa:rules:trigger-omnibus` except:
-# 1. Automatic jobs changed to `when: never.`
-# 2. Do not run for specific devops stage
-# If any changes are made to this rule, `.qa:rules:follow-up-e2e` should also be updated.
-.qa:rules:manual-omnibus-and-follow-up-e2e:
+# These provide a manual way to trigger follow-up:e2e:package-and-test-ee
+# It is fine if they're overlapping with the automatic ones.
+# It'll not hurt and it can simplify the rules, decoupling them.
+# If any changes are made to this rule, `.qa:rules:manual-e2e` should also be updated.
+.qa:rules:manual-e2e:
   rules:
     - !reference [".qa:rules:package-and-test-never-run", rules]
     - <<: *if-merge-request-and-specific-devops-stage
       when: never
     - !reference [".qa:rules:code-merge-request-manual", rules]
 
-# These are based on `.qa:rules:manual-omnibus-and-follow-up-e2e` but with manual jobs changed to automatic
+# These are based on `.qa:rules:manual-e2e` but with manual jobs changed to automatic
 .qa:rules:follow-up-e2e:
   rules:
     - !reference [".qa:rules:package-and-test-never-run", rules]
@@ -1764,16 +1769,21 @@
   rules:
     # From .qa:rules:package-and-test-common
     - !reference [".qa:rules:package-and-test-never-run", rules]
+    - <<: *if-ruby-branch
+      when: never
+    - <<: *if-merge-request-labels-run-all-e2e
+      when: never
+    - <<: *if-merge-request
+      changes: *qa-patterns
+      when: never
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
       when: never
-    - <<: *if-ruby-branch
+    - <<: *if-merge-request-not-approved
       when: never
     - <<: *if-merge-request
       changes: *dependency-patterns
       when: never
-    - <<: *if-merge-request-labels-run-all-e2e
-      when: never
     - <<: *if-merge-request
       changes: *feature-flag-development-config-patterns
       when: never
@@ -1786,22 +1796,16 @@
     - <<: *if-merge-request
       changes: *ci-qa-patterns
       when: never
-    - <<: *if-merge-request
-      changes: *qa-patterns
-      when: never
-    - <<: *if-dot-com-gitlab-org-and-security-merge-request
+    - <<: *if-security-merge-request
       changes: *code-patterns
       when: never
-    - <<: *if-force-ci
-      when: never
     - <<: *if-merge-request-and-specific-devops-stage
       when: never
+    - <<: *if-force-ci
+      when: never
     # From .qa:rules:package-and-test-schedule
     - <<: *if-dot-com-gitlab-org-schedule
       when: never
-    # Do not run on unapproved MR
-    - <<: *if-merge-request-not-approved
-      when: never
     - !reference [".qa:rules:code-merge-request-allowed-to-fail", rules]
 
 .qa:rules:fulfillment-e2e-quarantine-report:
@@ -2201,6 +2205,7 @@
 
 .rails:rules:detect-tests:
   rules:
+    - if: '$ENABLE_DETECT_TESTS == "true"'
     - <<: *if-merge-request-labels-run-all-rspec
     - <<: *if-merge-request
       changes: *code-backstage-qa-patterns
@@ -2343,6 +2348,7 @@
 
 .static-analysis:rules:rubocop:
   rules:
+    - if: '$ENABLE_RUBOCOP == "true"'
     - <<: *if-default-refs
       changes: *rubocop-patterns
       variables:

.gitlab/ci/setup.gitlab-ci.yml

@@ -220,6 +220,16 @@ e2e-test-pipeline-generate:
       - '*-pipeline.yml'
       - "${CI_PROJECT_DIR}/qa_tests_vars.env"
 
+# This is the manual start of the chain of E2E jobs
+# After playing this, it'll follow up with:
+# follow-up:compile-production-assets -> follow-up:build-assets-image --\
+#                                    \-> follow-up:trigger-omnibus-env -> follow-up:trigger-omnibus -> follow-up:e2e:package-and-test-ee
+# follow-up:build-qa-image --------------------------------------------------------------------------/
+manual:e2e-test-pipeline-generate:
+  extends:
+    - e2e-test-pipeline-generate
+    - .qa:rules:manual-e2e
+
 trigger-omnibus-env:
   stage: prepare
   extends:
@@ -263,3 +273,9 @@ trigger-omnibus-env as-if-foss:
     - compile-production-assets as-if-foss
   variables:
     FOSS_ONLY: "1"
+
+follow-up:trigger-omnibus-env:
+  extends:
+    - trigger-omnibus-env
+    - .qa:rules:follow-up-e2e
+  needs: ["follow-up:compile-production-assets"]

Gemfile

@@ -528,7 +528,7 @@ group :test do
   # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
   gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 
-  gem 'gitlab_quality-test_tooling', '~> 1.21.0', require: false, feature_category: :tooling
+  gem 'gitlab_quality-test_tooling', '~> 1.21.1', require: false, feature_category: :tooling
 end
 
 gem 'octokit', '~> 8.0', feature_category: :importers
@@ -563,7 +563,7 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 16.10.0-rc1', feature_category: :gitaly
+gem 'gitaly', '~> 16.10.1', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
 gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management

Gemfile.checksum

@@ -206,7 +206,7 @@
 {"name":"gettext","version":"3.4.9","platform":"ruby","checksum":"292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a"},
 {"name":"gettext_i18n_rails","version":"1.12.0","platform":"ruby","checksum":"6ac4817731a9e2ce47e1e83381ac34f9142263bc2911aaaafb2526d2f1afc1be"},
 {"name":"git","version":"1.18.0","platform":"ruby","checksum":"c9b80462e4565cd3d7a9ba8440c41d2c52244b17b0dad0bfddb46de70630c465"},
-{"name":"gitaly","version":"16.10.0.pre.rc1","platform":"ruby","checksum":"483162f2c271fc78e985ad6b25bd06f69a91a4fabc2ff6f25909db7f69458cdb"},
+{"name":"gitaly","version":"16.10.1","platform":"ruby","checksum":"8f416e71d70fcea89941ca02ddd74b0938ec31e11d5d297bc99e8e3a8861df5a"},
 {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"},
 {"name":"gitlab-chronic","version":"0.10.5","platform":"ruby","checksum":"f80f18dc699b708870a80685243331290bc10cfeedb6b99c92219722f729c875"},
 {"name":"gitlab-dangerfiles","version":"4.7.0","platform":"ruby","checksum":"2576876a8dcb7290853fc3aef8048001cfe593b87318dd0016959d42e0e145ca"},
@@ -226,7 +226,7 @@
 {"name":"gitlab-styles","version":"11.0.0","platform":"ruby","checksum":"0dd8ec066ce9955ac51d3616c6bfded30f75bb526f39ff392ece6f43d5b9406b"},
 {"name":"gitlab_chronic_duration","version":"0.12.0","platform":"ruby","checksum":"0d766944d415b5c831f176871ee8625783fc0c5bfbef2d79a3a616f207ffc16d"},
 {"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"},
-{"name":"gitlab_quality-test_tooling","version":"1.21.0","platform":"ruby","checksum":"b83555c80cffe5ef2709eb6e8674a4942c1bd44a47abea83effc19908d5a0b2c"},
+{"name":"gitlab_quality-test_tooling","version":"1.21.1","platform":"ruby","checksum":"83f2a115d21e921b0b540ba87765cad98f0766178244abc3d06d18dd1bd58ebc"},
 {"name":"globalid","version":"1.1.0","platform":"ruby","checksum":"b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f"},
 {"name":"gon","version":"6.4.0","platform":"ruby","checksum":"e3a618d659392890f1aa7db420f17c75fd7d35aeb5f8fe003697d02c4b88d2f0"},
 {"name":"google-apis-androidpublisher_v3","version":"0.34.0","platform":"ruby","checksum":"d7e1d7dd92f79c498fe2082222a1740d788e022e660c135564b3fd299cab5425"},

Gemfile.lock

@@ -685,7 +685,7 @@ GEM
     git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitaly (16.10.0.pre.rc1)
+    gitaly (16.10.1)
       grpc (~> 1.0)
     gitlab (4.19.0)
       httparty (~> 0.20)
@@ -741,7 +741,7 @@ GEM
       omniauth (>= 1.3, < 3)
       pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
       rubyntlm (~> 0.5)
-    gitlab_quality-test_tooling (1.21.0)
+    gitlab_quality-test_tooling (1.21.1)
       activesupport (>= 6.1, < 7.2)
       amatch (~> 0.4.1)
       gitlab (~> 4.19)
@@ -1904,7 +1904,7 @@ DEPENDENCIES
   gdk-toogle (~> 0.9)
   gettext (~> 3.4, >= 3.4.9)
   gettext_i18n_rails (~> 1.12.0)
-  gitaly (~> 16.10.0.pre.rc1)
+  gitaly (~> 16.10.1)
   gitlab-backup-cli!
   gitlab-chronic (~> 0.10.5)
   gitlab-dangerfiles (~> 4.7.0)
@@ -1929,7 +1929,7 @@ DEPENDENCIES
   gitlab-utils!
   gitlab_chronic_duration (~> 0.12)
   gitlab_omniauth-ldap (~> 2.2.0)
-  gitlab_quality-test_tooling (~> 1.21.0)
+  gitlab_quality-test_tooling (~> 1.21.1)
   gon (~> 6.4.0)
   google-apis-androidpublisher_v3 (~> 0.34.0)
   google-apis-cloudbilling_v1 (~> 0.21.0)

app/assets/javascripts/ci/pipeline_details/test_reports/test_case_details.vue

@@ -86,14 +86,14 @@ export default {
     @hidden="$emit('hidden')"
   >
     <div class="gl-display-flex gl-flex-wrap gl-mx-n4 gl-my-3">
-      <strong class="gl-text-right col-sm-3">{{ $options.text.name }}</strong>
+      <strong class="col-sm-3">{{ $options.text.name }}</strong>
       <div class="col-sm-9" data-testid="test-case-name">
         {{ testCase.name }}
       </div>
     </div>
 
     <div v-if="testCase.file" class="gl-display-flex gl-flex-wrap gl-mx-n4 gl-my-3">
-      <strong class="gl-text-right col-sm-3">{{ $options.text.file }}</strong>
+      <strong class="col-sm-3">{{ $options.text.file }}</strong>
       <div class="col-sm-9" data-testid="test-case-file">
         <gl-link v-if="testCase.filePath" :href="testCase.filePath">
           {{ testCase.file }}
@@ -110,7 +110,7 @@ export default {
     </div>
 
     <div class="gl-display-flex gl-flex-wrap gl-mx-n4 gl-my-3">
-      <strong class="gl-text-right col-sm-3">{{ $options.text.duration }}</strong>
+      <strong class="col-sm-3">{{ $options.text.duration }}</strong>
       <div v-if="testCase.formattedTime" class="col-sm-9" data-testid="test-case-duration">
         {{ testCase.formattedTime }}
       </div>
@@ -120,14 +120,14 @@ export default {
     </div>
 
     <div v-if="testCase.recent_failures" class="gl-display-flex gl-flex-wrap gl-mx-n4 gl-my-3">
-      <strong class="gl-text-right col-sm-3">{{ $options.text.history }}</strong>
+      <strong class="col-sm-3">{{ $options.text.history }}</strong>
       <div class="col-sm-9" data-testid="test-case-recent-failures">
         <gl-badge variant="warning">{{ failureHistoryMessage }}</gl-badge>
       </div>
     </div>
 
     <div v-if="testCase.attachment_url" class="gl-display-flex gl-flex-wrap gl-mx-n4 gl-my-3">
-      <strong class="gl-text-right col-sm-3">{{ $options.text.attachment }}</strong>
+      <strong class="col-sm-3">{{ $options.text.attachment }}</strong>
       <gl-link
         class="col-sm-9"
         :href="testCase.attachment_url"
@@ -143,10 +143,8 @@ export default {
       class="gl-display-flex gl-flex-wrap gl-mx-n4 gl-my-3"
       data-testid="test-case-trace"
     >
-      <strong class="gl-text-right col-sm-3">{{ $options.text.trace }}</strong>
-      <div class="col-sm-9">
-        <code-block :code="testCase.system_output" />
-      </div>
+      <strong class="col-sm-3 gl-mb-2">{{ $options.text.trace }}</strong>
+      <code-block class="gl-p-4" :code="testCase.system_output" />
     </div>
   </gl-modal>
 </template>

app/assets/javascripts/import_entities/import_groups/utils.js

@@ -19,6 +19,11 @@ export function isAvailableForImport(group) {
 }
 
 export function isProjectCreationAllowed(group = {}) {
+  // When "No parent" is selected
+  if (group.fullPath === '') {
+    return true;
+  }
+
   return Boolean(group.projectCreationLevel) && group.projectCreationLevel !== 'noone';
 }
 

app/assets/javascripts/merge_requests/components/reviewers/reviewer_drawer.vue

@@ -6,6 +6,8 @@ import { getContentWrapperHeight } from '~/lib/utils/dom_utils';
 export default {
   components: {
     GlDrawer,
+    ApprovalSummary: () =>
+      import('ee_component/merge_requests/components/reviewers/approval_summary.vue'),
   },
   props: {
     open: {
@@ -33,5 +35,8 @@ export default {
     <template #title>
       <h4 class="gl-my-0">{{ __('Assign reviewers') }}</h4>
     </template>
+    <template #header>
+      <approval-summary />
+    </template>
   </gl-drawer>
 </template>

app/assets/javascripts/packages_and_registries/container_registry/explorer/index.js

@@ -35,6 +35,7 @@ export default () => {
     expirationPolicy,
     isGroupPage,
     isAdmin,
+    isMetadataDatabaseEnabled,
     showCleanupPolicyLink,
     showContainerRegistrySettings,
     showUnfinishedTagCleanupCallout,
@@ -74,6 +75,7 @@ export default () => {
             showUnfinishedTagCleanupCallout: parseBoolean(showUnfinishedTagCleanupCallout),
             connectionError: parseBoolean(connectionError),
             invalidPathError: parseBoolean(invalidPathError),
+            isMetadataDatabaseEnabled: parseBoolean(isMetadataDatabaseEnabled),
           },
           /* eslint-disable @gitlab/require-i18n-strings */
           dockerBuildCommand: `docker build -t ${config.repositoryUrl} .`,

app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/list.vue

@@ -16,11 +16,11 @@ import { fetchPolicies } from '~/lib/graphql';
 import Tracking from '~/tracking';
 import PersistedPagination from '~/packages_and_registries/shared/components/persisted_pagination.vue';
 import PersistedSearch from '~/packages_and_registries/shared/components/persisted_search.vue';
+import MetadataDatabaseAlert from '~/packages_and_registries/shared/components/container_registry_metadata_database_alert.vue';
 import { FILTERED_SEARCH_TERM } from '~/vue_shared/components/filtered_search_bar/constants';
 import DeleteImage from '../components/delete_image.vue';
 import RegistryHeader from '../components/list_page/registry_header.vue';
 import DeleteModal from '../components/delete_modal.vue';
-
 import {
   DELETE_IMAGE_SUCCESS_MESSAGE,
   DELETE_IMAGE_ERROR_MESSAGE,
@@ -64,6 +64,7 @@ export default {
     GlSkeletonLoader,
     RegistryHeader,
     DeleteImage,
+    MetadataDatabaseAlert,
     PersistedPagination,
     PersistedSearch,
   },
@@ -233,6 +234,7 @@ export default {
 
 <template>
   <div>
+    <metadata-database-alert v-if="!config.isMetadataDatabaseEnabled" />
     <gl-alert
       v-if="showDeleteAlert"
       :variant="deleteAlertType"

app/assets/javascripts/packages_and_registries/settings/project/components/registry_settings_app.vue

@@ -9,6 +9,7 @@ import {
 import ContainerExpirationPolicy from '~/packages_and_registries/settings/project/components/container_expiration_policy.vue';
 import ContainerProtectionRules from '~/packages_and_registries/settings/project/components/container_protection_rules.vue';
 import PackagesCleanupPolicy from '~/packages_and_registries/settings/project/components/packages_cleanup_policy.vue';
+import MetadataDatabaseAlert from '~/packages_and_registries/shared/components/container_registry_metadata_database_alert.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
@@ -20,6 +21,7 @@ export default {
         'ee_component/packages_and_registries/settings/project/components/dependency_proxy_packages_settings.vue'
       ),
     GlAlert,
+    MetadataDatabaseAlert,
     PackagesCleanupPolicy,
     PackagesProtectionRules: () =>
       import('~/packages_and_registries/settings/project/components/packages_protection_rules.vue'),
@@ -29,6 +31,7 @@ export default {
     'showContainerRegistrySettings',
     'showPackageRegistrySettings',
     'showDependencyProxySettings',
+    'isContainerRegistryMetadataDatabaseEnabled',
   ],
   i18n: {
     UPDATE_SETTINGS_SUCCESS_MESSAGE,
@@ -67,6 +70,7 @@ export default {
 
 <template>
   <div data-testid="packages-and-registries-project-settings">
+    <metadata-database-alert v-if="!isContainerRegistryMetadataDatabaseEnabled" class="gl-mt-5" />
     <gl-alert
       v-if="showAlert"
       variant="success"

app/assets/javascripts/packages_and_registries/settings/project/registry_settings_bundle.js

@@ -21,6 +21,7 @@ export default () => {
     cleanupSettingsPath,
     tagsRegexHelpPagePath,
     helpPagePath,
+    isContainerRegistryMetadataDatabaseEnabled,
     showContainerRegistrySettings,
     showPackageRegistrySettings,
     showDependencyProxySettings,
@@ -39,6 +40,9 @@ export default () => {
       cleanupSettingsPath,
       tagsRegexHelpPagePath,
       helpPagePath,
+      isContainerRegistryMetadataDatabaseEnabled: parseBoolean(
+        isContainerRegistryMetadataDatabaseEnabled,
+      ),
       showContainerRegistrySettings: parseBoolean(showContainerRegistrySettings),
       showPackageRegistrySettings: parseBoolean(showPackageRegistrySettings),
       showDependencyProxySettings: parseBoolean(showDependencyProxySettings),

app/assets/javascripts/packages_and_registries/shared/components/container_registry_metadata_database_alert.vue

+<script>
+import { GlAlert, GlLink, GlSprintf } from '@gitlab/ui';
+import { getCookie, parseBoolean, setCookie } from '~/lib/utils/common_utils';
+import { helpPagePath } from '~/helpers/help_page_helper';
+
+const HIDE_METADATA_DATABASE_ALERT_COOKIE = 'hide_metadata_database_alert';
+
+export default {
+  name: 'ContainerRegistryMetadataDatabaseAlert',
+  components: {
+    GlAlert,
+    GlLink,
+    GlSprintf,
+  },
+  data() {
+    return {
+      showAlert: !parseBoolean(getCookie(HIDE_METADATA_DATABASE_ALERT_COOKIE)),
+    };
+  },
+  metadataDatabaseHelpPagePath: helpPagePath(
+    'administration/packages/container_registry_metadata_database',
+  ),
+  methods: {
+    hideAlert() {
+      this.showAlert = false;
+      setCookie(HIDE_METADATA_DATABASE_ALERT_COOKIE, 'true');
+      this.$emit('dismiss');
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-alert v-if="showAlert" class="gl-mt-5" @dismiss="hideAlert">
+    <gl-sprintf
+      :message="
+        s__(
+          'ContainerRegistry|The %{linkStart}next-generation container registry%{linkEnd} is now available for upgrade and testing on self-managed instances as a Beta feature. This upgraded registry supports online garbage collection, and has significant performance and reliability improvements.',
+        )
+      "
+    >
+      <template #link="{ content }">
+        <gl-link :href="$options.metadataDatabaseHelpPagePath"> {{ content }}</gl-link>
+      </template>
+    </gl-sprintf>
+  </gl-alert>
+</template>

app/assets/javascripts/releases/components/releases_empty_state.vue

@@ -25,7 +25,6 @@ export default {
     :title="$options.i18n.emptyStateTitle"
     :description="$options.i18n.emptyStateText"
     :svg-path="illustrationPath"
-    :svg-height="null"
     :primary-button-link="newReleasePath"
     :primary-button-text="$options.i18n.newRelease"
     :secondary-button-link="documentationPath"

app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue

@@ -59,18 +59,6 @@ export default {
     {{ reviewerTitle }}
     <gl-loading-icon v-if="loading" size="sm" inline class="align-bottom" />
     <template v-if="editable">
-      <gl-button
-        v-if="glFeatures.reviewerAssignDrawer"
-        v-tooltip.hover
-        :title="__('Add or edit reviewers')"
-        category="tertiary"
-        size="small"
-        class="gl-float-right gl-ml-2"
-        data-testid="drawer-toggle"
-        @click="toggleDrawerOpen"
-      >
-        {{ __('Edit') }}
-      </gl-button>
       <gl-button
         v-tooltip.hover
         :title="__('Quick assign')"
@@ -84,6 +72,18 @@ export default {
         :icon="glFeatures.reviewerAssignDrawer ? 'plus' : ''"
         ><template v-if="!glFeatures.reviewerAssignDrawer">{{ __('Edit') }}</template></gl-button
       >
+      <gl-button
+        v-if="glFeatures.reviewerAssignDrawer"
+        v-tooltip.hover
+        :title="__('Add or edit reviewers')"
+        category="tertiary"
+        size="small"
+        class="gl-float-right gl-ml-2"
+        data-testid="drawer-toggle"
+        @click="toggleDrawerOpen(!drawerOpen)"
+      >
+        {{ __('Edit') }}
+      </gl-button>
     </template>
     <mounting-portal v-if="glFeatures.reviewerAssignDrawer" mount-to="#js-reviewer-drawer-portal">
       <reviewer-drawer :open="drawerOpen" @close="toggleDrawerOpen(false)" />