.gitlab-ci.yml

@@ -27,11 +27,17 @@ default:
   # Default job timeout doesn't work: https://gitlab.com/gitlab-org/gitlab/-/issues/387528
   timeout: 90m
 
-.default-ruby-variables: &default-ruby-variables
+.old-ruby-variables: &old-ruby-variables
   RUBY_VERSION: "3.0"
+  CACHE_EDITION: "GITLAB_RUBY3_0"
 
-.next-ruby-variables: &next-ruby-variables
+.default-ruby-variables: &default-ruby-variables
   RUBY_VERSION: "3.1"
+  CACHE_EDITION: "GITLAB_RUBY3_1"
+
+.next-ruby-variables: &next-ruby-variables
+  RUBY_VERSION: "3.2"
+  CACHE_EDITION: "GITLAB_RUBY3_2"
 
 .default-branch-pipeline-failure-variables: &default-branch-pipeline-failure-variables
   CREATE_RAILS_TEST_FAILURE_ISSUES: "true"
@@ -51,6 +57,7 @@ workflow:
   rules:
     - if: '$CI_PROJECT_PATH == "gitlab-org/gitaly" && $CI_PIPELINE_SOURCE == "parent_pipeline" && $GITALY_TEST'
       variables:
+        <<: *default-ruby-variables
         PIPELINE_NAME: 'Gitaly Rails Test Pipeline'
     # If `$FORCE_GITLAB_CI` is set, create a pipeline.
     - if: '$FORCE_GITLAB_CI'
@@ -68,26 +75,36 @@ workflow:
     # they serve no purpose and will run anyway when the changes are merged.
     - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^release-tools\/\d+\.\d+\.\d+-rc\d+$/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee)?$/ && $CI_PROJECT_PATH == "gitlab-org/gitlab"'
       when: never
-    # For merge requests running exclusively in Ruby 3.0
     - if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3_0/'
+      variables:
+        <<: *old-ruby-variables
+        PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline'
+        NO_SOURCEMAPS: 'true'
+    - if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3_1/'
       variables:
         <<: *default-ruby-variables
         PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline'
         NO_SOURCEMAPS: 'true'
-    - if: '$CI_MERGE_REQUEST_LABELS =~ /Community contribution/'
+    - if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3_2/'
       variables:
         <<: *next-ruby-variables
+        PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline'
+        NO_SOURCEMAPS: 'true'
+    - if: '$CI_MERGE_REQUEST_LABELS =~ /Community contribution/'
+      variables:
+        <<: *default-ruby-variables
         GITLAB_DEPENDENCY_PROXY_ADDRESS: ""
         PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline (community contribution)'
         NO_SOURCEMAPS: 'true'
     - <<: *if-merge-request-security-canonical-sync
       variables:
+        <<: *default-ruby-variables
         PIPELINE_NAME: '$CI_DEFAULT_BRANCH security->canonical sync'
         SKIP_MESSAGE: 'MR only contains changes from the security mirror, which have already been reviewed, tested and deployed.'
     # For (detached) merge request pipelines.
     - if: '$CI_MERGE_REQUEST_IID'
       variables:
-        <<: *next-ruby-variables
+        <<: *default-ruby-variables
         <<: *default-merge-request-slow-tests-variables
         PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline'
         NO_SOURCEMAPS: 'true'
@@ -97,8 +114,11 @@ workflow:
         <<: [*default-ruby-variables, *default-branch-pipeline-failure-variables]
         CRYSTALBALL: "true"
         PIPELINE_NAME: 'Scheduled Ruby $RUBY_VERSION $CI_COMMIT_BRANCH branch pipeline'
-    # Run pipelines for ruby3_1 branch
-    - if: '$CI_COMMIT_BRANCH == "ruby3_1" && $CI_PIPELINE_SOURCE == "schedule"'
+    - if: '$CI_COMMIT_BRANCH == "ruby3_0" && $CI_PIPELINE_SOURCE == "schedule"'
+      variables:
+        <<: *old-ruby-variables
+        PIPELINE_NAME: 'Scheduled Ruby $RUBY_VERSION $CI_COMMIT_BRANCH branch pipeline'
+    - if: '$CI_COMMIT_BRANCH == "ruby3_2" && $CI_PIPELINE_SOURCE == "schedule"'
       variables:
         <<: *next-ruby-variables
         PIPELINE_NAME: 'Scheduled Ruby $RUBY_VERSION $CI_COMMIT_BRANCH branch pipeline'

.gitlab/CODEOWNERS

@@ -1443,12 +1443,14 @@ ee/lib/ee/api/entities/project.rb
 /ee/lib/sidebars/
 /ee/lib/ee/sidebars/
 
-# Necessary for availablity, similar to DB migrations
+# Necessary for availability, similar to DB migrations
 [Global Search] @gitlab-org/search-team/migration-maintainers
 /ee/elastic/migrate/
-/ee/spec/elastic/migrate/
 /ee/spec/support/elastic.rb
 
+^[Global Search] @gitlab-org/search-team/migration-maintainers
+/ee/spec/elastic/migrate/
+
 ^[Create::IDE - Remote Development Backend] @gitlab-org/maintainers/remote-development/backend
 /ee/app/models/remote_development/
 /ee/app/policies/remote_development/

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

@@ -64,6 +64,7 @@ start-as-if-foss:
     ENABLE_RSPEC_MIGRATION: $ENABLE_RSPEC_MIGRATION
     ENABLE_RSPEC_BACKGROUND_MIGRATION: $ENABLE_RSPEC_BACKGROUND_MIGRATION
     ENABLE_RSPEC_SYSTEM: $ENABLE_RSPEC_SYSTEM
+    ENABLE_JEST: $ENABLE_JEST
   trigger:
     project: gitlab-org/gitlab-foss
     branch: as-if-foss/${CI_COMMIT_REF_NAME}

.gitlab/ci/gitlab-com/danger-review.gitlab-ci.yml

 include:
   - project: gitlab-org/quality/pipeline-common
-    ref: 8.2.0
+    ref: 8.3.2
     file:
       - /ci/danger-review.yml
 

.gitlab/ci/qa-common/main.gitlab-ci.yml

@@ -5,7 +5,7 @@ workflow:
   name: $PIPELINE_NAME
 
 include:
-  - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@8.2.0"
+  - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@8.3.0"
     inputs:
       job_name: "e2e-test-report"
       job_stage: "report"
@@ -15,7 +15,7 @@ include:
       gitlab_auth_token_variable_name: "PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE"
       allure_job_name: "${QA_RUN_TYPE}"
   - project: gitlab-org/quality/pipeline-common
-    ref: 8.2.0
+    ref: 8.3.2
     file:
       - /ci/base.gitlab-ci.yml
       - /ci/knapsack-report.yml

.gitlab/ci/qa-common/variables.gitlab-ci.yml

 # Default variables for package-and-test
 
 variables:
-  USE_OLD_RUBY_VERSION: "true"
   REGISTRY_HOST: "registry.gitlab.com"
   REGISTRY_GROUP: "gitlab-org"
   ALLURE_JOB_NAME: $CI_PROJECT_NAME

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

@@ -90,9 +90,8 @@ trigger-omnibus:
     TOP_UPSTREAM_SOURCE_PROJECT: $CI_PROJECT_PATH
     SECURITY_SOURCES: $SECURITY_SOURCES
     CACHE_UPDATE: $OMNIBUS_GITLAB_CACHE_UPDATE
-    USE_OLD_RUBY_VERSION: "true"
-    CACHE_EDITION: "GITLAB_RUBY3_0"
-    NEXT_RUBY_VERSION: "3.1.4"
+    CACHE_EDITION: $CACHE_EDITION
+    NEXT_RUBY_VERSION: $FULL_RUBY_VERSION
     BUILD_ON_ALL_OS: $OMNIBUS_GITLAB_BUILD_ON_ALL_OS
     SKIP_QA_TEST: "true"
     ee: $EE

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

@@ -85,7 +85,7 @@ rspec migration pg14:
   extends:
     - .rspec-base-pg14
     - .rspec-base-migration
-    - .rspec-migration-parallel-pg14
+    - .rspec-migration-parallel
     - .rails:rules:ee-and-foss-migration
 
 rspec background_migration pg14:
@@ -154,8 +154,8 @@ rspec background_migration pg14 clusterwide-db:
 rspec unit pg14:
   extends:
     - .rspec-base-pg14
+    - .rspec-unit-parallel
     - .rails:rules:ee-and-foss-unit
-    - .rspec-unit-pg14-parallel
 
 rspec unit pg14 single-redis:
   extends:
@@ -195,7 +195,7 @@ rspec unit pg14 praefect:
 rspec integration pg14:
   extends:
     - .rspec-base-pg14
-    - .rspec-integration-parallel-pg14
+    - .rspec-integration-parallel
     - .rails:rules:ee-and-foss-integration
 
 rspec integration pg14 single-redis:
@@ -236,8 +236,8 @@ rspec integration pg14 praefect:
 rspec system pg14:
   extends:
     - .rspec-base-pg14
+    - .rspec-system-parallel
     - .rails:rules:ee-and-foss-system
-    - .rspec-system-parallel-pg14
   variables:
     DEBUG_GITLAB_TRANSACTION_STACK: "true"
 
@@ -295,15 +295,15 @@ rspec fast_spec_helper:
     # Load fast_spec_helper as well just in case there are no specs available.
     - bin/rspec --dry-run spec/fast_spec_helper.rb $fast_spec_helper_specs
 
-rspec unit clickhouse:
+rspec clickhouse:
   extends:
     - .rspec-base-pg14-clickhouse23
     - .rails:rules:clickhouse-changes
 
-rspec-ee unit clickhouse:
+rspec-ee clickhouse:
   extends:
     - .rspec-base-pg14-clickhouse23
-    - .rails:rules:clickhouse-changes
+    - .rails:rules:ee-only-clickhouse-changes
 
 gitlab:clickhouse:rollback:main:
   extends:
@@ -354,8 +354,8 @@ rspec:artifact-collector unit:
     - .artifact-collector
     - .rails:rules:ee-and-foss-unit
   needs:
-    - rspec unit pg14  # 24 jobs
-    - job: rspec unit clickhouse  # 1 job
+    - rspec unit pg14  # 32 jobs
+    - job: rspec clickhouse  # 1 job
       optional: true
 
 rspec:artifact-collector system:
@@ -363,17 +363,17 @@ rspec:artifact-collector system:
     - .artifact-collector
     - .rails:rules:ee-and-foss-system
   needs:
-    - rspec system pg14  # 26 jobs
+    - rspec system pg14  # 32 jobs
 
 rspec:artifact-collector remainder:
   extends:
     - .artifact-collector
   needs:
-    - job: rspec integration pg14  # 13 jobs
+    - job: rspec integration pg14  # 16 jobs
       optional: true
-    - job: rspec migration pg14  # 12 jobs
+    - job: rspec migration pg14  # 15 jobs
       optional: true
-    - job: rspec background_migration pg14  # 4 jobs
+    - job: rspec background_migration pg14  # 5 jobs
       optional: true
   rules:
     - !reference ['.rails:rules:ee-and-foss-integration', rules]
@@ -385,58 +385,73 @@ rspec:artifact-collector as-if-foss unit:
     - .artifact-collector
     - .rails:rules:as-if-foss-unit
   needs:
-    - rspec unit pg14-as-if-foss  # 28 jobs
+    - rspec unit pg14-as-if-foss  # 32 jobs
 
 rspec:artifact-collector as-if-foss system:
   extends:
     - .artifact-collector
     - .rails:rules:as-if-foss-system
   needs:
-    - rspec system pg14-as-if-foss  # 28 jobs
+    - rspec system pg14-as-if-foss  # 32 jobs
 
 rspec:artifact-collector as-if-foss remainder:
   extends:
     - .artifact-collector
   needs:
-    - job: rspec integration pg14-as-if-foss  # 12 jobs
+    - job: rspec integration pg14-as-if-foss  # 16 jobs
       optional: true
-    - job: rspec migration pg14-as-if-foss  # 8 jobs
+    - job: rspec migration pg14-as-if-foss  # 15 jobs
       optional: true
-    - job: rspec background_migration pg14-as-if-foss  # 4 jobs
+    - job: rspec background_migration pg14-as-if-foss  # 5 jobs
       optional: true
   rules:
     - !reference ['.rails:rules:as-if-foss-integration', rules]
     - !reference ['.rails:rules:as-if-foss-migration', rules]
     - !reference ['.rails:rules:as-if-foss-background-migration', rules]
 
-rspec:artifact-collector single-redis:
+rspec:artifact-collector unit single-redis:
   extends:
     - .artifact-collector
     - .rails:rules:single-redis
   needs:
-    - rspec unit pg14 single-redis  # 28 jobs
-    - rspec integration pg14 single-redis  # 12 jobs
+    - rspec unit pg14 single-redis  # 32 jobs
 
 rspec:artifact-collector system single-redis:
   extends:
     - .artifact-collector
     - .rails:rules:single-redis
   needs:
-    - rspec system pg14 single-redis  # 28 jobs
+    - rspec system pg14 single-redis  # 32 jobs
+
+rspec:artifact-collector remainder single-redis:
+  extends:
+    - .artifact-collector
+    - .rails:rules:single-redis
+  needs:
+    - rspec integration pg14 single-redis  # 16 jobs
 
 rspec:artifact-collector ee single-redis:
   extends:
     - .artifact-collector
     - .rails:rules:single-redis
   needs:
-    - job: rspec-ee unit pg14 single-redis  # 18 jobs
+    - job: rspec-ee unit pg14 single-redis  # 28 jobs
       optional: true
-    - job: rspec-ee integration pg14 single-redis  # 6 jobs
+    - job: rspec-ee integration pg14 single-redis  # 7 jobs
       optional: true
-    - job: rspec-ee system pg14 single-redis  # 10 jobs
+    - job: rspec-ee system pg14 single-redis  # 14 jobs
       optional: true
 
-rspec:artifact-collector ee:
+rspec:artifact-collector ee unit:
+  extends:
+    - .artifact-collector
+  needs:
+    - job: rspec-ee unit pg14  # 28 jobs
+      optional: true
+  rules:
+    - !reference ['.rails:rules:ee-only-unit', rules]
+
+rspec:artifact-collector ee remainder:
   extends:
     - .artifact-collector
   needs:
@@ -444,18 +459,15 @@ rspec:artifact-collector ee:
       optional: true
     - job: rspec-ee background_migration pg14  # 2 jobs
       optional: true
-    - job: rspec-ee unit pg14  # 22 jobs
-      optional: true
-    - job: rspec-ee unit clickhouse  # 1 job
+    - job: rspec-ee clickhouse  # 1 job
       optional: true
-    - job: rspec-ee integration pg14  # 5 jobs
+    - job: rspec-ee integration pg14  # 7 jobs
       optional: true
-    - job: rspec-ee system pg14  # 12 jobs
+    - job: rspec-ee system pg14  # 14 jobs
       optional: true
   rules:
     - !reference ['.rails:rules:ee-only-migration', rules]
     - !reference ['.rails:rules:ee-only-background-migration', rules]
-    - !reference ['.rails:rules:ee-only-unit', rules]
     - !reference ['.rails:rules:ee-only-integration', rules]
     - !reference ['.rails:rules:ee-only-system', rules]
 
@@ -475,10 +487,12 @@ rspec:coverage:
       optional: true
     - job: rspec:artifact-collector remainder
       optional: true
-    - job: rspec:artifact-collector single-redis
+    - job: rspec:artifact-collector unit single-redis
       optional: true
     - job: rspec:artifact-collector system single-redis
       optional: true
+    - job: rspec:artifact-collector remainder single-redis
+      optional: true
     # as-if-foss jobs
     - job: rspec:artifact-collector as-if-foss unit
       optional: true
@@ -489,7 +503,9 @@ rspec:coverage:
     # EE jobs
     - job: rspec:artifact-collector ee single-redis
       optional: true
-    - job: rspec:artifact-collector ee
+    - job: rspec:artifact-collector ee unit
+      optional: true
+    - job: rspec:artifact-collector ee remainder
       optional: true
     # Memory jobs
     - job: memory-on-boot
@@ -637,7 +653,7 @@ rspec migration pg14-as-if-foss:
   extends:
     - .rspec-base-pg14-as-if-foss
     - .rspec-base-migration
-    - .rspec-migration-parallel-pg14-as-if-foss
+    - .rspec-migration-parallel
     - .rails:rules:as-if-foss-migration
 
 rspec background_migration pg14-as-if-foss:
@@ -874,8 +890,8 @@ rspec-ee background_migration pg14 praefect:
 rspec-ee unit pg14:
   extends:
     - .rspec-ee-base-pg14
+    - .rspec-ee-unit-parallel
     - .rails:rules:ee-only-unit
-    - .rspec-ee-unit-pg14-parallel
 
 rspec-ee unit pg14 es8:
   extends:
@@ -913,8 +929,8 @@ rspec-ee unit pg14 clusterwide-db:
 rspec-ee integration pg14:
   extends:
     - .rspec-ee-base-pg14
+    - .rspec-ee-integration-parallel
     - .rails:rules:ee-only-integration
-    - .rspec-ee-integration-parallel-pg14
 
 rspec-ee integration pg14 es8:
   extends:
@@ -952,8 +968,8 @@ rspec-ee integration pg14 clusterwide-db:
 rspec-ee system pg14:
   extends:
     - .rspec-ee-base-pg14
+    - .rspec-ee-system-parallel
     - .rails:rules:ee-only-system
-    - .rspec-ee-system-parallel-pg14
 
 rspec-ee system pg14 es8:
   extends:

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

@@ -265,10 +265,10 @@ include:
 # rspec:artifact-collector jobs in .gitlab/ci/rails.gitlab-ci.yml
 # Please double-check and adjust accordingly
 .rspec-migration-parallel:
-  parallel: 8
+  parallel: 15
 
 .rspec-background-migration-parallel:
-  parallel: 4
+  parallel: 5
 
 .rspec-ee-migration-parallel:
   parallel: 2
@@ -277,58 +277,19 @@ include:
   parallel: 2
 
 .rspec-unit-parallel:
-  parallel: 28
+  parallel: 32
 
 .rspec-ee-unit-parallel:
-  parallel: 18
+  parallel: 28
 
 .rspec-integration-parallel:
-  parallel: 12
+  parallel: 16
 
 .rspec-ee-integration-parallel:
-  parallel: 6
+  parallel: 7
 
 .rspec-system-parallel:
-  parallel: 28
+  parallel: 32
 
 .rspec-ee-system-parallel:
-  parallel: 10
-
-# Optimizations to distribute CI time more evenly across the CI/CD pipeline
-#
-# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133976 for more info
-
-# Giving 4 jobs to `rspec-ee unit pg14`
-.rspec-unit-pg14-parallel:
-  parallel: 24
-
-# Receiving 4 jobs from `rspec unit pg14`
-.rspec-ee-unit-pg14-parallel:
-  parallel: 22
-
-# Giving 2 jobs to `rspec-ee system pg14`
-.rspec-system-parallel-pg14:
-  parallel: 26
-
-# Receiving 2 jobs from `rspec system pg14`
-.rspec-ee-system-parallel-pg14:
-  parallel: 12
-
-# Adding 4 jobs, as those needs to be a bit faster.
-.rspec-migration-parallel-pg14:
-  parallel: 12
-
-# Adding 2 jobs, as those needs to be a bit faster.
-.rspec-migration-parallel-pg14-as-if-foss:
-  parallel: 10
-
-# Giving 1 job to `rspec integration pg14`
-.rspec-ee-integration-parallel-pg14:
-  parallel: 5
-
-# Receiving 1 job from `rspec-ee integration pg14`
-.rspec-integration-parallel-pg14:
-  parallel: 13
-
-# rspec job parallel configs
-############################
+  parallel: 14

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

@@ -21,7 +21,7 @@
   if: '$FORCE_GITLAB_CI'
 
 .if-default-refs: &if-default-refs
-  if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/ || $CI_COMMIT_REF_NAME =~ /^\d+-\d+-auto-deploy-\d+$/ || $CI_COMMIT_REF_NAME =~ /^security\// || $CI_COMMIT_REF_NAME == "ruby3_1" || ($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") || $CI_COMMIT_TAG || $FORCE_GITLAB_CI'
+  if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/ || $CI_COMMIT_REF_NAME =~ /^\d+-\d+-auto-deploy-\d+$/ || $CI_COMMIT_REF_NAME =~ /^security\// || $CI_COMMIT_REF_NAME =~ /^ruby\d+(_\d)*$/ || ($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") || $CI_COMMIT_TAG || $FORCE_GITLAB_CI'
 
 .if-default-branch-refs: &if-default-branch-refs
   if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID == null'
@@ -59,14 +59,8 @@
 .if-merge-request-targeting-stable-branch: &if-merge-request-targeting-stable-branch
   if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee|-jh)?$/'
 
-.if-merge-request-labels-run-in-ruby3_0: &if-merge-request-labels-run-in-ruby3_0
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3_0/'
-
-.if-merge-request-labels-run-in-ruby3_1: &if-merge-request-labels-run-in-ruby3_1
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3_1/'
-
-.if-merge-request-labels-run-in-ruby3_2: &if-merge-request-labels-run-in-ruby3_2
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3_2/'
+.if-merge-request-labels-run-in-ruby: &if-merge-request-labels-run-in-ruby
+  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby\d+(_\d)*/'
 
 .if-merge-request-labels-as-if-foss: &if-merge-request-labels-as-if-foss
   if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-foss/'
@@ -128,8 +122,8 @@
 .if-default-branch-schedule-nightly: &if-default-branch-schedule-nightly
   if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "nightly"'
 
-.if-ruby3_1-branch-schedule-nightly: &if-ruby3_1-branch-schedule-nightly
-  if: '$CI_COMMIT_BRANCH == "ruby3_1" && $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "nightly"'
+.if-ruby-branch-schedule-nightly: &if-ruby-branch-schedule-nightly
+  if: '$CI_COMMIT_BRANCH =~ /^ruby\d+(_\d)*$/ && $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "nightly"'
 
 .if-security-schedule: &if-security-schedule
   if: '$CI_PROJECT_NAMESPACE == "gitlab-org/security" && $CI_PIPELINE_SOURCE == "schedule"'
@@ -164,8 +158,8 @@
 .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-ruby3_1-branch: &if-ruby3_1-branch
-  if: '$CI_COMMIT_BRANCH == "ruby3_1" || $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3_1/'
+.if-ruby-branch: &if-ruby-branch
+  if: '$CI_COMMIT_BRANCH =~ /^ruby\d+(_\d)*$/ || $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby\d+(_\d)*/'
 
 ####################
 # Changes patterns #
@@ -914,7 +908,7 @@
     - <<: *if-dot-com-gitlab-org-schedule
       variables:
         ARCH: amd64,arm64
-    - <<: *if-ruby3_1-branch
+    - <<: *if-ruby-branch
     - !reference [".releases:rules:canonical-dot-com-gitlab-stable-branch-only-setup-test-env-patterns", rules]
 
 .build-images:rules:build-qa-image-as-if-foss:
@@ -950,7 +944,7 @@
     # The rest are included to be consistent with .qa:rules:e2e:test-on-gdk
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
-    - <<: *if-ruby3_1-branch
+    - <<: *if-ruby-branch
     # We include the job under the matching conditions below, but unlike in .qa:rules:e2e:test-on-gdk we don't need to
     # set OMNIBUS_GITLAB_BUILD_ON_ALL_OS when testing against GDK
     - <<: *if-merge-request
@@ -982,7 +976,7 @@
       when: never
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
-    - <<: *if-ruby3_1-branch
+    - <<: *if-ruby-branch
     - <<: *if-merge-request-labels-run-review-app
     - <<: *if-auto-deploy-branches
     - <<: *if-default-refs
@@ -1207,7 +1201,7 @@
       changes: *setup-test-env-patterns
     - <<: *if-merge-request-labels-run-review-app
     - <<: *if-auto-deploy-branches
-    - <<: *if-ruby3_1-branch
+    - <<: *if-ruby-branch
     - <<: *if-default-refs
       changes: *ci-build-images-patterns
     - <<: *if-default-refs
@@ -1256,6 +1250,7 @@
   rules:
     - <<: *if-merge-request-labels-pipeline-expedite
       when: never
+    - if: '$ENABLE_JEST == "true"'
     - <<: *if-merge-request-labels-run-all-rspec
     - <<: *if-merge-request-labels-frontend-and-feature-flag
     - <<: *if-default-refs
@@ -1306,6 +1301,7 @@
       when: never
     - <<: *if-fork-merge-request
       when: never
+    - if: '$ENABLE_JEST == "true"'
     - <<: *if-merge-request-labels-run-all-jest
     - <<: *if-merge-request-labels-frontend-and-feature-flag
     - <<: *if-merge-request
@@ -1520,7 +1516,7 @@
       allow_failure: true
     - <<: *if-dot-com-gitlab-org-schedule
       allow_failure: true
-    - <<: *if-ruby3_1-branch
+    - <<: *if-ruby-branch
     # Rules to support .qa:rules:package-and-test-ee
     - <<: *if-merge-request
       changes: *dependency-patterns
@@ -1549,10 +1545,7 @@
     - !reference [".qa:rules:package-and-test-never-run", rules]
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
-    - <<: *if-ruby3_1-branch
-      variables:
-        USE_OLD_RUBY_VERSION: 'false'
-        CACHE_EDITION: 'GITLAB_RUBY3_1'
+    - <<: *if-ruby-branch
     - <<: *if-merge-request
       changes: *dependency-patterns
       variables:
@@ -1594,10 +1587,7 @@
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
       allow_failure: true
-    - <<: *if-ruby3_1-branch
-      variables:
-        USE_OLD_RUBY_VERSION: 'false'
-        CACHE_EDITION: 'GITLAB_RUBY3_1'
+    - <<: *if-ruby-branch
       allow_failure: true
     - <<: *if-merge-request
       changes: *dependency-patterns
@@ -1645,10 +1635,7 @@
     - !reference [".qa:rules:package-and-test-never-run", rules]
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
-    - <<: *if-ruby3_1-branch
-      variables:
-        USE_OLD_RUBY_VERSION: 'false'
-        CACHE_EDITION: 'GITLAB_RUBY3_1'
+    - <<: *if-ruby-branch
     - <<: *if-merge-request
       # Certain components trigger a rebuild of the e2e GDK image so we want to test it too
       changes: *gdk-component-patterns
@@ -1764,7 +1751,7 @@
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
       when: never
-    - <<: *if-ruby3_1-branch
+    - <<: *if-ruby-branch
       when: never
     - <<: *if-merge-request
       changes: *dependency-patterns
@@ -1811,7 +1798,7 @@
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
       when: never
-    - <<: *if-ruby3_1-branch
+    - <<: *if-ruby-branch
       when: never
     - <<: *if-merge-request
       changes: *dependency-patterns
@@ -1850,7 +1837,7 @@
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
       when: never
-    - <<: *if-ruby3_1-branch
+    - <<: *if-ruby-branch
       when: never
     - <<: *if-merge-request
       changes: *dependency-patterns
@@ -2084,6 +2071,21 @@
     - <<: *if-default-refs
       changes: *backstage-patterns
 
+.rails:rules:clickhouse-changes:
+  rules:
+    - <<: *if-fork-merge-request
+      when: never
+    - if: '$ENABLE_RSPEC_UNIT == "true"'
+    - !reference [".rails:rules:ee-and-foss-default-rules", rules]
+    - <<: *if-default-refs
+      changes: *backend-patterns
+
+.rails:rules:ee-only-clickhouse-changes:
+  rules:
+    - <<: *if-not-ee
+      when: never
+    - !reference [".rails:rules:clickhouse-changes", rules]
+
 .rails:rules:ee-and-foss-integration:
   rules:
     - <<: *if-fork-merge-request
@@ -2416,12 +2418,6 @@
       changes: *code-backstage-patterns
       when: always
 
-.rails:rules:clickhouse-changes:
-  rules:
-    - <<: *if-dot-com-ee-schedule-default-branch-maintenance
-    - <<: *if-merge-request
-      changes: *backend-patterns
-
 #########################
 # Static analysis rules #
 #########################
@@ -2828,7 +2824,7 @@
 
 .setup:rules:verify-default-ruby:
   rules:
-    - <<: *if-merge-request-labels-run-in-ruby3_2
+    - <<: *if-merge-request-labels-run-in-ruby
 
 .setup:rules:verify-tests-yml:
   rules:

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

@@ -71,8 +71,7 @@ verify-default-ruby:
     - .setup:rules:verify-default-ruby
   stage: prepare
   script:
-    - echo 'Please remove label ~"pipeline:run-in-ruby3_2" so we do test against default Ruby version before merging the merge request'
-    - echo 'This does not work yet. See https://gitlab.com/gitlab-org/gitlab/-/issues/428537'
+    - echo 'Please remove label ~"pipeline:run-in-ruby3_2" or ~"pipeline:run-in-ruby3_0" so we do test against default Ruby version before merging the merge request'
     - exit 1
 
 verify-tests-yml:
@@ -207,8 +206,7 @@ trigger-omnibus-env:
       echo "OMNIBUS_GITLAB_CACHE_UPDATE=${OMNIBUS_GITLAB_CACHE_UPDATE:-false}" >> $BUILD_ENV
       for version_file in *_VERSION; do echo "$version_file=$(cat $version_file)" >> $BUILD_ENV; done
       echo "OMNIBUS_GITLAB_BUILD_ON_ALL_OS=${OMNIBUS_GITLAB_BUILD_ON_ALL_OS:-false}" >> $BUILD_ENV
-      echo "USE_OLD_RUBY_VERSION=${USE_OLD_RUBY_VERSION:-false}" >> $BUILD_ENV
-      echo "NEXT_RUBY_VERSION=${NEXT_RUBY_VERSION}" >> $BUILD_ENV
+      ruby -e 'puts "FULL_RUBY_VERSION=#{RUBY_VERSION}"' >> $BUILD_ENV
       echo "GITLAB_ASSETS_TAG=$(assets_image_tag)" >> $BUILD_ENV
       echo "EE=$([[ $FOSS_ONLY == '1' ]] && echo 'false' || echo 'true')" >> $BUILD_ENV
       define_trigger_branch_in_build_env

.gitlab/ci/test-metadata.gitlab-ci.yml

@@ -36,13 +36,13 @@ update-tests-metadata:
     - rspec migration pg14
     - rspec-all frontend_fixture
     - rspec unit pg14
-    - rspec unit clickhouse
+    - rspec clickhouse
     - rspec integration pg14
     - rspec system pg14
     - rspec background_migration pg14
     - rspec-ee migration pg14
     - rspec-ee unit pg14
-    - rspec-ee unit clickhouse
+    - rspec-ee clickhouse
     - rspec-ee integration pg14
     - rspec-ee system pg14
     - rspec-ee background_migration pg14

.gitlab/issue_templates/QA Failure.md

@@ -24,7 +24,7 @@ Corresponding test case(s):
 
 ### Stack trace
 
-```
+```ruby
 PUT STACK TRACE HERE
 ```
 

.gitlab/merge_request_templates/Quarantine End to End Test.md

@@ -19,12 +19,12 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new
   - [ ] [Code review guidelines](https://docs.gitlab.com/ee/development/code_review.html)
   - [ ] [Style guides](https://docs.gitlab.com/ee/development/contributing/style_guides.html)
 - [ ] Quarantine test check-list
-  - [ ] Follow the [Quarantining Tests guide](https://about.gitlab.com/handbook/engineering/infrastructure/test-platform/debugging-qa-test-failures/#quarantining-tests).
-  - [ ] Confirm the test has a [`quarantine:` tag with the specified quarantine type](https://about.gitlab.com/handbook/engineering/infrastructure/test-platform/debugging-qa-test-failures/#quarantined-test-types).
+  - [ ] Follow the [Quarantining Tests guide](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/debugging-qa-test-failures/#quarantining-tests).
+  - [ ] Confirm the test has a [`quarantine:` tag with the specified quarantine type](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/debugging-qa-test-failures/#quarantined-test-types).
   - [ ] Note if the test should be [quarantined for a specific environment](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/execution_context_selection.html#quarantine-a-test-for-a-specific-environment).
   - [ ] (Optionally) In case of an emergency (e.g. blocked deployments), consider adding labels to pick into auto-deploy (~"Pick into auto-deploy" ~"priority::1" ~"severity::1").
 - [ ] Dequarantine test check-list
-  - [ ] Follow the [Dequarantining Tests guide](https://about.gitlab.com/handbook/engineering/infrastructure/test-platform/debugging-qa-test-failures/#dequarantining-tests).
+  - [ ] Follow the [Dequarantining Tests guide](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/debugging-qa-test-failures/#dequarantining-tests).
   - [ ] Confirm the test consistently passes on the target GitLab environment(s).
 - [ ] To ensure a faster turnaround, ask in the `#quality_maintainers` Slack channel for someone to review and merge the merge request, rather than assigning it directly.
 

.rubocop.yml

@@ -1035,7 +1035,7 @@ Cop/FeatureFlagUsage:
 
 Style/ArgumentsForwarding:
   Enabled: true
-  AllowOnlyRestArgument: false
+  UseAnonymousForwarding: false # Turn this on only after Ruby 3.2+ is required
 
 Search/NamespacedClass:
   Enabled: true
@@ -1118,3 +1118,10 @@ Style/SymbolProc:
 # See https://gitlab.com/gitlab-org/gitlab/-/issues/435940#note_1703307479
 Style/HashSyntax:
   EnforcedShorthandSyntax: never
+
+Gitlab/LicenseAvailableUsage:
+  Enabled: true
+  Include:
+    - 'app/models/application_setting.rb'
+    - 'ee/app/models/ee/application_setting.rb'
+    - 'lib/gitlab/current_settings.rb'

.rubocop_todo/layout/array_alignment.yml

@@ -283,7 +283,6 @@ Layout/ArrayAlignment:
     - 'spec/lib/gitlab/usage_data/topology_spec.rb'
     - 'spec/lib/gitlab/utils/merge_hash_spec.rb'
     - 'spec/lib/gitlab/visibility_level_spec.rb'
-    - 'spec/models/application_setting_spec.rb'
     - 'spec/models/ci/bridge_spec.rb'
     - 'spec/models/ci/build_spec.rb'
     - 'spec/models/ci/group_spec.rb'

.rubocop_todo/layout/space_in_lambda_literal.yml

@@ -358,7 +358,7 @@ Layout/SpaceInLambdaLiteral:
     - 'lib/gitlab/metrics/exporter/base_exporter.rb'
     - 'lib/gitlab/visibility_level.rb'
     - 'spec/deprecation_toolkit_env.rb'
-    - 'spec/features/admin/users/user_spec.rb'
+    - 'spec/features/admin/users/admin_sees_unconfirmed_user_spec.rb'
     - 'spec/helpers/namespaces_helper_spec.rb'
     - 'spec/lib/backup/gitaly_backup_spec.rb'
     - 'spec/lib/container_registry/client_spec.rb'

.rubocop_todo/rails/file_path.yml

@@ -99,7 +99,6 @@ Rails/FilePath:
     - 'spec/lib/gitlab/feature_categories_spec.rb'
     - 'spec/lib/gitlab/file_hook_spec.rb'
     - 'spec/lib/gitlab/jwt_authenticatable_spec.rb'
-    - 'spec/lib/gitlab/legacy_http_spec.rb'
     - 'spec/lib/gitlab/mail_room/mail_room_spec.rb'
     - 'spec/lib/gitlab/middleware/multipart/handler_spec.rb'
     - 'spec/lib/gitlab/multi_destination_logger_spec.rb'

.rubocop_todo/rspec/before_all_role_assignment.yml

@@ -739,7 +739,6 @@ RSpec/BeforeAllRoleAssignment:
     - 'ee/spec/workers/ee/new_issue_worker_spec.rb'
     - 'ee/spec/workers/groups/export_memberships_worker_spec.rb'
     - 'ee/spec/workers/llm/completion_worker_spec.rb'
-    - 'ee/spec/workers/merge_requests/llm/summarize_merge_request_worker_spec.rb'
     - 'ee/spec/workers/security/orchestration_configuration_create_bot_worker_spec.rb'
     - 'spec/controllers/autocomplete_controller_spec.rb'
     - 'spec/controllers/dashboard_controller_spec.rb'
@@ -800,7 +799,7 @@ RSpec/BeforeAllRoleAssignment:
     - 'spec/controllers/projects_controller_spec.rb'
     - 'spec/controllers/repositories/lfs_storage_controller_spec.rb'
     - 'spec/features/admin/admin_projects_spec.rb'
-    - 'spec/features/admin/users/user_spec.rb'
+    - 'spec/features/admin/users/admin_sees_user_spec.rb'
     - 'spec/features/admin/users/users_spec.rb'
     - 'spec/features/boards/board_filters_spec.rb'
     - 'spec/features/boards/new_issue_spec.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -1040,8 +1040,7 @@ RSpec/ContextWording:
     - 'spec/features/admin/admin_mode_spec.rb'
     - 'spec/features/admin/admin_settings_spec.rb'
     - 'spec/features/admin/dashboard_spec.rb'
-    - 'spec/features/admin/users/user_impersonation_spec.rb'
-    - 'spec/features/admin/users/user_spec.rb'
+    - 'spec/features/admin/users/admin_impersonates_user_spec.rb'
     - 'spec/features/admin/users/users_spec.rb'
     - 'spec/features/atom/dashboard_issues_spec.rb'
     - 'spec/features/atom/dashboard_spec.rb'
@@ -1843,7 +1842,6 @@ RSpec/ContextWording:
     - 'spec/lib/gitlab/kubernetes/default_namespace_spec.rb'
     - 'spec/lib/gitlab/kubernetes/kube_client_spec.rb'
     - 'spec/lib/gitlab/legacy_github_import/client_spec.rb'
-    - 'spec/lib/gitlab/legacy_http_spec.rb'
     - 'spec/lib/gitlab/lfs/client_spec.rb'
     - 'spec/lib/gitlab/lfs_token_spec.rb'
     - 'spec/lib/gitlab/lograge/custom_options_spec.rb'