.dockerignore

 # `build_from_dir` can't find Dockerfile when `.dockerignore` is "*"
 # See https://github.com/swipely/docker-api/issues/484
-# Ignore all folders except the following files we need to build the QA image:
-# - ./config/initializers/0_inject_enterprise_edition_module.rb
-# - ./config/feature_flags
-# - ./ee/config/feature_flags
-# - ./ee/app/models/license.rb
-# - ./lib/gitlab_edition.rb
-# - ./lib/gitlab/utils.rb
-# - ./qa/
-# - ./INSTALLATION_TYPE
-# - ./VERSION
-
+# Ignore all folders except the one listed at the bottom of this file.
 /.git/
 /app/
 /bin/
 /builds/
 /changelogs/
-/config/environments/
-/config/helpers/
-/config/knative/
-/config/locales/
-/config/prometheus/
-/config/routes/
+/config/
+/coverage/
 /danger/
+/data/
 /db/
 /doc/
-/docker/
-/ee/bin/
-/ee/changelogs/
-/ee/config/events/
-/ee/config/metrics/
-/ee/config/routes/
-/ee/db/
-/ee/fixtures/
-/ee/lib/
-/ee/locale/
-/ee/spec/
+/ee/
+/file_hooks/
 /fixtures/
-/templates/
-/lint/
-/lib/api/
-/lib/assets/
-/lib/backup/
-/lib/banzai/
-/lib/bitbucket/
-/lib/server/
-/lib/constraints/
-/lib/registry/
-/lib/policy/
-/lib/feature/
-/lib/generators/
-/lib/gitaly/
-/lib/api/
-/lib/token/
-/lib/mattermost/
-/lib/teams/
-/lib/storage/
-/lib/auth/
-/lib/peek/
-/lib/prometheus/
-/lib/quality/
-/lib/rouge/
-/lib/flaky/
-/lib/zip/
-/lib/sentry/
-/lib/serializers/
-/lib/support/
-/lib/check/
-/lib/tasks/
+/gems/
+/generator_templates/
+/glfm_specification/
+/haml_lint/
+/jh/
+/lib/
 /locale/
 /log/
-/modules/
+/metrics_server/
 /node_modules/
-/plugins/
+/patches/
 /public/
+/qa/
 /rubocop/
 /scripts/
 /shared/
+/sidekiq_cluster/
 /spec/
-/symbol/
+/storybook/
 /tmp/
+/tooling/
+/vendor/
+/workhorse/
+
+!/config/initializers/0_inject_enterprise_edition_module.rb
+!/config/feature_flags/
+!/config/bundler_setup.rb
+!/lib/gitlab_edition.rb
+!/lib/gitlab/utils.rb
+!/spec/support/fast_quarantine.rb
+!/tooling/lib/tooling/fast_quarantine.rb
+!/INSTALLATION_TYPE
+!/VERSION
+!/gems/
+!/qa/
+!/vendor/gems/
+
+!/ee/app/models/license.rb
+!/ee/config/feature_flags/
+
+!/jh/qa/
+!/jh/lib/
+!/jh/config/feature_flags/

.eslintrc.yml

@@ -136,6 +136,8 @@ rules:
     - paths:
         - name: mousetrap
           message: 'Import { Mousetrap } from ~/lib/mousetrap instead.'
+        - name: vuex
+          message: 'See our documentation on "Migrating from VueX" for tips on how to avoid adding new VueX stores.'
   unicorn/prefer-dom-node-dataset:
     - error
   no-unsanitized/method:

.gitlab-ci.yml

@@ -163,7 +163,7 @@ variables:
   KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/report-master.json
   RSPEC_CHANGED_FILES_PATH: rspec/changed_files.txt
   RSPEC_FAIL_FAST_THRESHOLD: 20
-  RSPEC_FAST_QUARANTINE_LOCAL_PATH: rspec/fast_quarantine-gitlab.txt
+  RSPEC_FAST_QUARANTINE_PATH: rspec/fast_quarantine-gitlab.txt
   RSPEC_FOSS_IMPACT_PIPELINE_TEMPLATE_YML: .gitlab/ci/rails/rspec-foss-impact.gitlab-ci.yml.erb
   RSPEC_LAST_RUN_RESULTS_FILE: rspec/rspec_last_run_results.txt
   RSPEC_MATCHING_JS_FILES_PATH: rspec/js_matching_files.txt

.gitlab/CODEOWNERS

@@ -48,7 +48,7 @@ GITALY_SERVER_VERSION @project_278964_bot6 @gitlab-org/maintainers/rails-backend
 /spec/frontend_integration/
 /ee/spec/frontend_integration/
 
-^[Database] @gitlab-org/maintainers/database
+[Database] @gitlab-org/maintainers/database
 /db/
 /ee/db/
 /lib/gitlab/background_migration/
@@ -59,16 +59,6 @@ GITALY_SERVER_VERSION @project_278964_bot6 @gitlab-org/maintainers/rails-backend
 /ee/app/finders/
 /rubocop/rubocop-migrations.yml
 
-[Create::IDE - Remote Development Scripts] @gitlab-org/maintainers/remote-development/backend
-# This entry must occur before `/scripts/` in order to be matched first
-/scripts/remote_development/
-
-# This entry must occur before `/scripts/glfm/**/*`/`/scripts/lib/glfm/**/*` in order to be matched first
-/scripts/glfm/**/*.js @gitlab-org/maintainers/frontend
-/scripts/lib/glfm/**/*.js @gitlab-org/maintainers/frontend
-/scripts/glfm/**/* @gitlab-org/maintainers/rails-backend
-/scripts/lib/glfm/**/* @gitlab-org/maintainers/rails-backend
-
 [Pipeline configuration] @gl-quality/eng-prod
 /.gitlab-ci.yml
 /.gitlab/ci/
@@ -84,14 +74,15 @@ GITALY_SERVER_VERSION @project_278964_bot6 @gitlab-org/maintainers/rails-backend
 /gems/gem.gitlab-ci.yml
 
 [Tooling] @gl-quality/eng-prod
-/.gitlab/CODEOWNERS
 Dangerfile
 /danger/
 /tooling/danger/
 /scripts/
 /scripts/**/*.rb @gl-quality/eng-prod @gitlab-org/maintainers/rails-backend
+/scripts/**/glfm/**/* @gl-quality/eng-prod @gitlab-org/plan-stage/backend-engineers
 /scripts/**/*.js @gl-quality/eng-prod @gitlab-org/maintainers/frontend
 /scripts/frontend/ @gl-quality/eng-prod @gitlab-org/maintainers/frontend
+/scripts/remote_development/ @gitlab-org/maintainers/remote-development/backend
 /scripts/review_apps/seed-dast-test-data.sh @gl-quality/eng-prod @dappelt @ngeorge1
 /.codeclimate.yml
 /.dockerignore
@@ -472,6 +463,7 @@ lib/gitlab/checks/**
 /doc/administration/invalidate_markdown_cache.md @msedlakjakubowski
 /doc/administration/issue_closing_pattern.md @aqualls
 /doc/administration/job_artifacts.md @marcel.amirault
+/doc/administration/job_artifacts_troubleshooting.md @marcel.amirault
 /doc/administration/job_logs.md @fneill
 /doc/administration/labels.md @msedlakjakubowski
 /doc/administration/lfs/ @msedlakjakubowski
@@ -746,6 +738,7 @@ lib/gitlab/checks/**
 /doc/ci/test_cases/ @msedlakjakubowski
 /doc/ci/testing/code_quality.md @rdickenson
 /doc/development/advanced_search.md @ashrafkhamis
+/doc/development/ai_features.md @sselhorn
 /doc/development/application_limits.md @axil
 /doc/development/audit_event_guide/ @eread
 /doc/development/auto_devops.md @phillipwells
@@ -835,6 +828,8 @@ lib/gitlab/checks/**
 /doc/development/workhorse/ @msedlakjakubowski
 /doc/downgrade_ee_to_ce/ @axil
 /doc/drawers/ @ashrafkhamis
+/doc/editor_extensions/ @aqualls
+/doc/editor_extensions/visual_studio_code/ @ashrafkhamis
 /doc/gitlab-basics/ @msedlakjakubowski
 /doc/install/ @axil
 /doc/install/postgresql_extensions.md @aqualls
@@ -845,7 +840,6 @@ lib/gitlab/checks/**
 /doc/integration/datadog.md @eread @ashrafkhamis
 /doc/integration/external-issue-tracker.md @eread @ashrafkhamis
 /doc/integration/gitpod.md @ashrafkhamis
-/doc/integration/glab/ @aqualls
 /doc/integration/gmail_action_buttons_for_gitlab.md @eread @ashrafkhamis
 /doc/integration/index.md @eread @ashrafkhamis
 /doc/integration/jenkins.md @eread @ashrafkhamis
@@ -879,14 +873,19 @@ lib/gitlab/checks/**
 /doc/tutorials/configure_gitlab_runner_to_use_gke/ @fneill
 /doc/tutorials/container_scanning/ @rdickenson
 /doc/tutorials/convert_personal_namespace_to_group/ @lciutacu
+/doc/tutorials/create_register_first_runner/ @fneill
 /doc/tutorials/dependency_scanning.md @rdickenson
 /doc/tutorials/fuzz_testing/ @rdickenson
 /doc/tutorials/install_gitlab_single_node/ @axil
+/doc/tutorials/issue_triage/ @msedlakjakubowski
 /doc/tutorials/move_personal_project_to_group/ @lciutacu
 /doc/tutorials/protected_workflow/ @aqualls
 /doc/tutorials/scan_result_policy/ @rdickenson
+/doc/tutorials/update_commit_messages/ @msedlakjakubowski
+/doc/tutorials/website_project_with_analytics/ @lciutacu
 /doc/update/ @axil
 /doc/update/background_migrations.md @aqualls
+/doc/user/ai_features.md @sselhorn
 /doc/user/analytics/ @lciutacu
 /doc/user/analytics/ci_cd_analytics.md @phillipwells
 /doc/user/application_security/ @rdickenson
@@ -962,6 +961,7 @@ lib/gitlab/checks/**
 /doc/user/project/members/ @lciutacu
 /doc/user/project/merge_requests/ @aqualls
 /doc/user/project/merge_requests/csv_export.md @eread
+/doc/user/project/merge_requests/reviews/data_usage.md @sselhorn
 /doc/user/project/merge_requests/status_checks.md @eread
 /doc/user/project/milestones/ @msedlakjakubowski
 /doc/user/project/organize_work_with_projects.md @lciutacu
@@ -973,9 +973,9 @@ lib/gitlab/checks/**
 /doc/user/project/releases/release_evidence.md @eread
 /doc/user/project/remote_development/ @ashrafkhamis
 /doc/user/project/repository/ @aqualls
+/doc/user/project/repository/code_suggestions.md @sselhorn
 /doc/user/project/repository/file_finder.md @ashrafkhamis
 /doc/user/project/repository/managing_large_repositories.md @axil
-/doc/user/project/repository/vscode.md @ashrafkhamis
 /doc/user/project/repository/web_editor.md @ashrafkhamis
 /doc/user/project/requirements/ @msedlakjakubowski
 /doc/user/project/service_desk/ @msedlakjakubowski
@@ -995,6 +995,7 @@ lib/gitlab/checks/**
 /doc/user/shortcuts.md @ashrafkhamis
 /doc/user/snippets.md @aqualls
 /doc/user/ssh.md @jglassman1
+/doc/user/storage_management_automation.md @fneill
 /doc/user/tasks.md @msedlakjakubowski
 /doc/user/todos.md @msedlakjakubowski
 /doc/user/usage_quotas.md @fneill
@@ -1381,7 +1382,7 @@ lib/gitlab/checks/**
 # CI/CD templates require approval from specific owners.
 /lib/gitlab/ci/templates/ @gitlab-org/maintainers/cicd-templates
 /lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @DylanGriffith @mayra-cabrera @tkuah
-/lib/gitlab/ci/templates/Security/ @gonzoyumo @twoodham @sethgitlab @thiagocsf
+/lib/gitlab/ci/templates/Security/ @gonzoyumo @twoodham @amarpatel
 /lib/gitlab/ci/templates/Security/API-Fuzzing.*.yml @gitlab-org/secure/dynamic-analysis
 /lib/gitlab/ci/templates/Security/Container-Scanning.*.yml @gitlab-org/secure/composition-analysis-be
 /lib/gitlab/ci/templates/Security/Coverage-Fuzzing.*.yml @gitlab-org/secure/dynamic-analysis
@@ -1491,12 +1492,13 @@ ee/lib/ee/api/entities/project.rb
 /ee/app/graphql/resolvers/remote_development/
 /ee/app/controllers/remote_development/
 /ee/app/services/remote_development/
-/ee/spec/frontend/remote_development/
+/ee/lib/remote_development/
 /ee/spec/features/remote_development/
 /ee/spec/models/remote_development/
 /ee/spec/policies/remote_development/
 /ee/spec/requests/api/graphql/mutations/remote_development/
 /ee/spec/requests/api/graphql/remote_development/
+/ee/spec/features/remote_development/ @gitlab-org/maintainers/remote-development/backend @gitlab-org/maintainers/remote-development/frontend
 /ee/spec/finders/remote_development/
 /ee/spec/support/shared_contexts/remote_development/
 /ee/spec/graphql/types/remote_development/
@@ -1505,13 +1507,14 @@ ee/lib/ee/api/entities/project.rb
 /ee/spec/fixtures/remote_development/
 /ee/spec/controllers/remote_development/
 /ee/spec/services/remote_development/
-/ee/lib/remote_development/
-/qa/qa/specs/features/ee/browser_ui/3_create/remote_development/
+/qa/qa/specs/features/**/remote_development/ @gitlab-org/maintainers/remote-development/backend @gl-quality/qe-maintainers
 
 [Create::IDE - Remote Development Frontend] @gitlab-org/maintainers/remote-development/frontend
+/ee/app/assets/remote_development/
+/ee/app/assets/**/remote_development/
 /ee/app/views/remote_development/
-/ee/app/assets/javascripts/remote_development/
-/ee/app/assets/javascripts/pages/remote_development/
+/ee/spec/frontend/remote_development/
+/ee/spec/frontend/**/remote_development/
 
 # JiHu GitLab rules. See https://gitlab.com/gitlab-jh/gitlab-jh-enablement/-/issues/213#note_1024367528
 

.gitlab/ci/docs.gitlab-ci.yml

@@ -42,7 +42,7 @@ review-docs-cleanup:
 docs-lint links:
   extends:
     - .docs:rules:docs-lint
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-html:alpine-3.18-ruby-3.2.2-4207821e
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-html:alpine-3.18-ruby-3.2.2-6a53d93b
   stage: lint
   needs: []
   script:

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

@@ -31,6 +31,10 @@
     - assets_compile_script
     - echo -n "${GITLAB_ASSETS_HASH}" > "cached-assets-hash.txt"
 
+.update-cache-base:
+  after_script:
+    - yarn patch-package --reverse  # To avoid caching patched modules
+
 compile-production-assets:
   extends:
     - .compile-assets-base
@@ -47,8 +51,6 @@ compile-production-assets:
       - public/assets/
       - "${WEBPACK_COMPILE_LOG_PATH}"
     when: always
-  after_script:
-    - rm -f /etc/apt/sources.list.d/google*.list  # We don't need to update Chrome here
 
 compile-production-assets as-if-foss:
   extends:
@@ -77,6 +79,7 @@ compile-test-assets as-if-foss:
 update-assets-compile-production-cache:
   extends:
     - compile-production-assets
+    - .update-cache-base
     - .assets-compile-cache-push
     - .shared:rules:update-cache
   stage: prepare
@@ -85,18 +88,17 @@ update-assets-compile-production-cache:
 update-assets-compile-test-cache:
   extends:
     - compile-test-assets
+    - .update-cache-base
     - .assets-compile-cache-push
     - .shared:rules:update-cache
   stage: prepare
-  script:
-    - !reference [compile-test-assets, script]
-    - echo -n "${GITLAB_ASSETS_HASH}" > "cached-assets-hash.txt"
   artifacts: {}  # This job's purpose is only to update the cache.
 
 update-storybook-yarn-cache:
   extends:
     - .default-retry
     - .default-utils-before_script
+    - .update-cache-base
     - .storybook-yarn-cache-push
     - .shared:rules:update-cache
   stage: prepare

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

@@ -36,7 +36,17 @@
 
 .ruby-gems-cache-push: &ruby-gems-cache-push
   <<: *ruby-gems-cache
-  policy: push  # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
+  policy: push # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
+
+.ruby-coverage-gems-cache: &ruby-coverage-gems-cache
+  key: "ruby-coverage-gems-debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}"
+  paths:
+    - vendor/ruby/
+  policy: pull
+
+.ruby-coverage-gems-cache-push: &ruby-coverage-gems-cache-push
+  <<: *ruby-coverage-gems-cache
+  policy: push # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
 
 .gitaly-binaries-cache: &gitaly-binaries-cache
   key:
@@ -161,9 +171,13 @@
     - *ruby-gems-cache  # We don't push this cache as it's already rebuilt by `update-setup-test-env-cache`
     - *rubocop-cache-push
 
-.coverage-cache:
+.ruby-gems-coverage-cache:
   cache:
-    - *ruby-gems-cache
+    - *ruby-coverage-gems-cache
+
+.ruby-gems-coverage-cache-push:
+  cache:
+    - *ruby-coverage-gems-cache-push
 
 .ruby-node-cache:
   cache:
@@ -509,4 +523,4 @@
       url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/repository/files/scripts%2Futils.sh/raw?ref=${CI_COMMIT_SHA}"
       curl -f --header "Private-Token: ${PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE}" "${url}" --create-dirs --output scripts/utils.sh
     - source scripts/utils.sh
-    - download_files ${FILES_TO_DOWNLOAD}
+    - run_timed_command "download_files ${FILES_TO_DOWNLOAD}"

.gitlab/ci/package-and-test/main.gitlab-ci.yml

 # E2E tests pipeline loaded dynamically by script: scripts/generate-e2e-pipeline
-# For adding new tests, refer to: doc/development/testing_guide/end_to_end/package_and_test_pipeline.md
+# For adding new tests, refer to: doc/development/testing_guide/end_to_end/test_pipelines.md
 include:
   - local: .gitlab/ci/qa-common/main.gitlab-ci.yml
   - local: .gitlab/ci/qa-common/rules.gitlab-ci.yml
@@ -35,6 +35,11 @@ download-knapsack-report:
     - .download-knapsack-report
     - .rules:download-knapsack
 
+download-fast-quarantine-report:
+  extends:
+    - .download-fast-quarantine-report
+    - .rules:download-fast-quarantine-report
+
 cache-gems:
   extends:
     - .qa-install
@@ -99,6 +104,7 @@ instance:
   variables:
     QA_SCENARIO: Test::Instance::Image
   rules:
+    - !reference [.rules:test:smoke-for-omnibus-mr, rules]
     - !reference [.rules:test:feature-flags-set, rules]  # always run instance to validate ff change
     - !reference [.rules:test:qa-parallel, rules]
     - if: $QA_SUITES =~ /Test::Instance::All/
@@ -135,6 +141,7 @@ praefect:
     QA_CAN_TEST_PRAEFECT: "true"
     KNAPSACK_TEST_FILE_PATTERN: "qa/specs/features/**/3_create/**/*_spec.rb"
   rules:
+    - !reference [.rules:test:smoke-for-omnibus-mr, rules]
     - !reference [.rules:test:qa-parallel, rules]
     - if: $QA_SUITES =~ /Test::Instance::All/
 
@@ -172,6 +179,7 @@ decomposition-single-db:
     QA_SCENARIO: Test::Instance::Image
     GITLAB_QA_OPTS: --omnibus-config decomposition_single_db $EXTRA_GITLAB_QA_OPTS
   rules:
+    - !reference [.rules:test:smoke-for-omnibus-mr, rules]
     - !reference [.rules:test:qa-parallel, rules]
     - if: $QA_SUITES =~ /Test::Instance::All/
 
@@ -208,6 +216,7 @@ decomposition-multiple-db:
     GITLAB_ALLOW_SEPARATE_CI_DATABASE: "true"
     GITLAB_QA_OPTS: --omnibus-config decomposition_multiple_db $EXTRA_GITLAB_QA_OPTS
   rules:
+    - !reference [.rules:test:smoke-for-omnibus-mr, rules]
     - !reference [.rules:test:qa-parallel, rules]
     - if: $QA_SUITES =~ /Test::Instance::All/
 

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

@@ -6,7 +6,7 @@ workflow:
 
 include:
   - project: gitlab-org/quality/pipeline-common
-    ref: 7.2.3
+    ref: 7.5.0
     file:
       - /ci/base.gitlab-ci.yml
       - /ci/knapsack-report.yml
@@ -61,6 +61,11 @@ stages:
     GITLAB_LICENSE_MODE: test
     GITLAB_QA_ADMIN_ACCESS_TOKEN: $QA_ADMIN_ACCESS_TOKEN
     GITLAB_QA_OPTS: $EXTRA_GITLAB_QA_OPTS
+  before_script:
+    - !reference [.qa-base, before_script]
+    # Prepend the file paths with the absolute path from inside the container since the files will be read from there
+    - export RSPEC_FAST_QUARANTINE_PATH="/home/gitlab/qa/${RSPEC_FAST_QUARANTINE_PATH}"
+    - export RSPEC_SKIPPED_TESTS_REPORT_PATH="/home/gitlab/qa/rspec/skipped_tests-${CI_JOB_ID}.txt"
   # Allow QA jobs to fail as they are flaky. The top level `package-and-e2e:ee`
   # pipeline is not allowed to fail, so without allowing QA to fail, we will be
   # blocking merges due to flaky tests.
@@ -85,6 +90,26 @@ stages:
       - qa/knapsack/*.json
     expire_in: 1 day
 
+.download-fast-quarantine-report:
+  image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}alpine:edge
+  stage: .pre
+  variables:
+    GIT_STRATEGY: none
+  before_script:
+    - apk add --no-cache --update curl bash
+  script:
+    - mkdir -p "${QA_RSPEC_REPORT_PATH}"
+    - |
+      if [[ ! -f "${QA_RSPEC_REPORT_PATH}/${RSPEC_FAST_QUARANTINE_FILE}" ]]; then
+        curl --location -o "${QA_RSPEC_REPORT_PATH}/${RSPEC_FAST_QUARANTINE_FILE}" "https://gitlab-org.gitlab.io/quality/engineering-productivity/fast-quarantine/${RSPEC_FAST_QUARANTINE_PATH}" ||
+          echo "" > "${QA_RSPEC_REPORT_PATH}/${RSPEC_FAST_QUARANTINE_FILE}"
+      fi
+  allow_failure: true
+  artifacts:
+    paths:
+      - "${QA_RSPEC_REPORT_PATH}/${RSPEC_FAST_QUARANTINE_FILE}"
+    expire_in: 1 day
+
 .upload-knapsack-report:
   extends:
     - .generate-knapsack-report-base

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

@@ -64,6 +64,10 @@
   rules:
     - when: always
 
+.rules:download-fast-quarantine-report:
+  rules:
+    - when: always
+
 # ------------------------------------------
 # Test
 # ------------------------------------------
@@ -151,6 +155,15 @@
     - *default-branch
     - *feature-flags-set-manual
 
+.rules:test:smoke-for-omnibus-mr:
+  rules:
+    - if: '$CI_PROJECT_NAME == "omnibus-gitlab" && $PIPELINE_TYPE =~ /TRIGGERED_(CE|EE)_PIPELINE/ && $QA_OMNIBUS_MR_TESTS == "only-smoke-reliable"'
+      variables:
+        QA_RSPEC_TAGS: "--tag smoke --tag reliable --tag ~orchestrated --tag ~skip_live_env"
+    - if: '$CI_PROJECT_NAME == "omnibus-gitlab" && $PIPELINE_TYPE =~ /TRIGGERED_(CE|EE)_PIPELINE/ && $QA_OMNIBUS_MR_TESTS == "except-smoke-reliable"'
+      variables:
+        QA_RSPEC_TAGS: "--tag ~smoke --tag ~reliable --tag ~orchestrated --tag ~skip_live_env --tag ~transient"
+
 # ------------------------------------------
 # Report
 # ------------------------------------------

.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
@@ -11,4 +12,9 @@ variables:
   # run all tests by default when package-and-test is included natively in other projects
   # this will be overridden when selective test execution is used in gitlab canonical project
   QA_RUN_ALL_TESTS: "true"
-  USE_OLD_RUBY_VERSION: "true"
+  # Used by gitlab-qa to set up a volume for `${CI_PROJECT_DIR}/qa/rspec:/home/gitlab/qa/rspec/`
+  QA_RSPEC_REPORT_PATH: "${CI_PROJECT_DIR}/qa/rspec"
+  RSPEC_FAST_QUARANTINE_FILE: "fast_quarantine-gitlab.txt"
+  # This path is relative to /home/gitlab/qa/ in the QA container
+  RSPEC_FAST_QUARANTINE_PATH: "rspec/${RSPEC_FAST_QUARANTINE_FILE}"
+  QA_OMNIBUS_MR_TESTS: "only-smoke-reliable"

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

@@ -56,13 +56,29 @@ update-gitaly-binaries-cache:
   artifacts:
     paths: []  # This job's purpose is only to update the cache.
 
+update-ruby-gems-coverage-cache-push:
+  extends:
+    - .ruby-gems-coverage-cache-push
+    - .shared:rules:update-cache
+  variables:
+    BUNDLE_WITHOUT: "" # This is to override the variable defined in .gitlab-ci.yml
+    BUNDLE_ONLY: "coverage"
+  script:
+    - source scripts/utils.sh
+    - bundle_install_script
+
+# Used in:
+#   - rspec:coverage
+#   - rspec:undercoverage
 .coverage-base:
   extends:
     - .default-retry
-    - .coverage-cache
+    - .ruby-gems-coverage-cache
+  variables:
+    BUNDLE_WITHOUT: "" # This is to override the variable defined in .gitlab-ci.yml
+    BUNDLE_ONLY: "coverage"
   before_script:
     - source scripts/utils.sh
-    - export BUNDLE_WITHOUT="${BUNDLE_WITHOUT}:default:test:puma:kerberos:metrics:omnibus:ed25519"
     - bundle_install_script
 
 rspec migration pg14:
@@ -445,12 +461,14 @@ rspec:artifact-collector ee:
     - !reference ['.rails:rules:ee-only-system', rules]
 
 rspec:coverage:
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-bullseye-slim-ruby-${RUBY_VERSION}
   extends:
     - .coverage-base
     - .rails:rules:rspec-coverage
   stage: post-test
   needs:
-    - setup-test-env
+    - job: setup-test-env
+      artifacts: false
     # FOSS/EE jobs
     - job: rspec:artifact-collector unit
       optional: true
@@ -477,6 +495,7 @@ rspec:coverage:
     # Memory jobs
     - job: memory-on-boot
       optional: true
+      artifacts: false
   script:
     - run_timed_command "bundle exec scripts/merge-simplecov"
   coverage: '/LOC \((\d+\.\d+%)\) covered.$/'
@@ -493,6 +512,7 @@ rspec:coverage:
         path: coverage/coverage.xml
 
 rspec:undercoverage:
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-bullseye-slim-ruby-${RUBY_VERSION}
   extends:
     - .coverage-base
     - .rails:rules:rspec-undercoverage
@@ -513,7 +533,6 @@ rspec:undercoverage:
 
 rspec:feature-flags:
   extends:
-    - .coverage-base
     - .rails:rules:rspec-feature-flags
   stage: post-test
   needs:
@@ -521,11 +540,13 @@ rspec:feature-flags:
     - job: "haml-lint"
     - job: "haml-lint ee"
       optional: true
+  before_script:
+    - source scripts/utils.sh
   script:
     - if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
-        run_timed_command "bundle exec scripts/used-feature-flags" || (scripts/slack master-broken "☠️ \`${CI_JOB_NAME}\` failed! ☠️ See ${CI_JOB_URL}" ci_failing "GitLab Bot" && exit 1);
+        run_timed_command "scripts/used-feature-flags" || (scripts/slack master-broken "☠️ \`${CI_JOB_NAME}\` failed! ☠️ See ${CI_JOB_URL}" ci_failing "GitLab Bot" && exit 1);
       else
-        run_timed_command "bundle exec scripts/used-feature-flags";
+        run_timed_command "scripts/used-feature-flags";
       fi
 
 rspec:flaky-tests-report:
@@ -534,9 +555,6 @@ rspec:flaky-tests-report:
     - .rails:rules:flaky-tests-report
   stage: post-test
   needs: !reference ["rspec:coverage", "needs"]
-  variables:
-    SKIPPED_TESTS_REPORT_PATH: rspec/skipped_tests_report.txt
-    RETRIED_TESTS_REPORT_PATH: rspec/flaky/retried_tests_report.txt
   before_script:
     - source scripts/utils.sh
     - source scripts/rspec_helpers.sh
@@ -549,7 +567,6 @@ rspec:flaky-tests-report:
 
 rspec:merge-auto-explain-logs:
   extends:
-    - .coverage-base
     - .rails:rules:rspec-merge-auto-explain-logs
   stage: post-test
   needs: !reference ["rspec:coverage", "needs"]

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

@@ -25,6 +25,8 @@ include:
     # gems could not be found under some circumstance. No idea why, hours wasted.
     - run_timed_command "gem install knapsack --no-document"
     - section_start "gitaly-test-spawn" "Spawning Gitaly"; scripts/gitaly-test-spawn; section_end "gitaly-test-spawn"  # Do not use 'bundle exec' here
+    - export RSPEC_SKIPPED_TESTS_REPORT_PATH="rspec/skipped_tests-${CI_JOB_ID}.txt"
+    - export RSPEC_RETRIED_TESTS_REPORT_PATH="rspec/retried_tests-${CI_JOB_ID}.txt"
 
 .no-redis-cluster:
   variables:

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

@@ -60,7 +60,7 @@ review-build-cng:
 .review-workflow-base:
   image: ${REVIEW_APPS_IMAGE}
   retry:
-    max: 2  # This is confusing but this means "3 runs at max"
+    max: 1  # This is confusing but this means "2 runs at max"
   variables:
     HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
     DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
@@ -69,6 +69,7 @@ review-build-cng:
     GITLAB_REPO_URL: ${CI_PROJECT_URL}
     GITLAB_IMAGE_REPOSITORY: "registry.gitlab.com/gitlab-org/build/cng-mirror"
     GITLAB_IMAGE_SUFFIX: "ee"
+    GITLAB_REVIEW_APP_BASE_CONFIG_FILE: "scripts/review_apps/base-config.yaml"
     GITLAB_HELM_CHART_REF: "75b1486a9aec212d0f49ef1251526d8e51004bbc"  # 7.0.1: https://gitlab.com/gitlab-org/charts/gitlab/-/commit/75b1486a9aec212d0f49ef1251526d8e51004bbc
   environment:
     name: review/${CI_COMMIT_REF_SLUG}${SCHEDULE_TYPE}  # No separator for SCHEDULE_TYPE so it's compatible as before and looks nice without it

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

@@ -503,7 +503,9 @@
   - "tests.yml"
   - "config.ru"
   - "{,ee/,jh/}{app,bin,config,db,generator_templates,haml_lint,lib,locale,public,scripts,storybook,symbol,vendor}/**/*"
-  - "doc/api/graphql/reference/*"  # Files in this folder are auto-generated
+  # Auto-generated files
+  - "doc/api/graphql/reference/*"
+  - "doc/administration/audit_event_streaming/audit_event_types.md"
   # CI changes
   - ".gitlab-ci.yml"
   - ".gitlab/ci/**/*"
@@ -604,6 +606,18 @@
   - "scripts/glfm/**/*"
   - "scripts/lib/glfm/**/*"
 
+# Certain components require the base e2e GDK image to be rebuilt if they change
+.gdk-component-patterns: &gdk-component-patterns
+  - qa/gdk/**/*
+  - Gemfile.lock
+  - yarn.lock
+  - workhorse/**/*
+  - VERSION
+  - GITLAB_WORKHORSE_VERSION
+  - GITLAB_METRICS_EXPORTER_VERSION
+  - GITLAB_SHELL_VERSION
+  - GITALY_SERVER_VERSION
+
 ##################
 # Conditions set #
 ##################
@@ -905,15 +919,7 @@
     - <<: *if-merge-request
       variables:
         BUILD_GDK_BASE: "true"
-      changes:
-        - qa/gdk/**/*
-        - Gemfile.lock
-        - yarn.lock
-        - workhorse/**/*
-        - VERSION
-        - GITLAB_METRICS_EXPORTER_VERSION
-        - GITLAB_SHELL_VERSION
-        - GITALY_SERVER_VERSION
+      changes: *gdk-component-patterns
     # 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
@@ -1430,6 +1436,9 @@
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
       allow_failure: true
+    - <<: *if-merge-request
+      # Certain components trigger a rebuild of the e2e GDK image so we want to test it too
+      changes: *gdk-component-patterns
     - <<: *if-merge-request
       changes: *code-backstage-qa-patterns
       allow_failure: true
@@ -1566,6 +1575,9 @@
       variables:
         USE_OLD_RUBY_VERSION: 'false'
         CACHE_EDITION: 'GITLAB_RUBY3_1'
+    - <<: *if-merge-request
+      # Certain components trigger a rebuild of the e2e GDK image so we want to test it too
+      changes: *gdk-component-patterns
     - <<: *if-merge-request
       changes: *dependency-patterns
     - <<: *if-merge-request-labels-run-all-e2e
@@ -2215,11 +2227,11 @@
       when: never
     - <<: *if-merge-request-labels-skip-undercoverage
       when: never
+    - <<: *if-merge-request-labels-run-all-rspec
     # We cannot get the coverage data from child pipeline so we only run undercoverage on full pipelines for now
     # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113410#note_1335422806
     - <<: *if-merge-request-not-approved
       when: never
-    - <<: *if-merge-request-labels-run-all-rspec
     - <<: *if-merge-request
       changes: *backend-patterns
 
@@ -2236,6 +2248,8 @@
       when: never
     - <<: *if-merge-request-labels-run-all-rspec
     - <<: *if-merge-request-labels-record-queries
+    - <<: *if-default-branch-refs
+      changes: *code-patterns
 
 .rails:rules:default-branch-schedule-nightly--code-backstage-default-rules:
   rules:

.gitlab/ci/test-on-gdk/main.gitlab-ci.yml

@@ -117,6 +117,11 @@ cache-gems:
         gdk reconfigure &&\
         gdk restart"
 
+download-fast-quarantine-report:
+  extends:
+    - .download-fast-quarantine-report
+    - .rules:download-fast-quarantine-report
+
 gdk-qa-smoke:
   extends:
     - .gdk-qa-base

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

@@ -11,6 +11,8 @@ workhorse:verify:
 .workhorse:test:
   extends: .workhorse:rules:workhorse
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}-rust-${RUST_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-2.36-exiftool-12.60
+  services:
+    - name: redis:${REDIS_VERSION}-alpine
   variables:
     GITALY_ADDRESS: "tcp://127.0.0.1:8075"
   stage: test
@@ -22,6 +24,8 @@ workhorse:verify:
     - bundle_install_script
     - go version
     - scripts/gitaly-test-build
+    - cp workhorse/config.toml.example workhorse/config.toml
+    - sed -i 's|URL.*$|URL = "redis://redis:6379"|g' workhorse/config.toml
   script:
     - make -C workhorse test
 
@@ -30,6 +34,7 @@ workhorse:test go:
   parallel:
     matrix:
       - GO_VERSION: ["1.18", "1.19", "1.20"]
+        REDIS_VERSION: ["7.0", "6.2"]
   script:
     - make -C workhorse test-coverage
   coverage: '/\d+.\d+%/'
@@ -43,11 +48,15 @@ workhorse:test fips:
   parallel:
     matrix:
       - GO_VERSION: ["1.18", "1.19", "1.20"]
+        REDIS_VERSION: ["7.0", "6.2"]
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/ubi-${UBI_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}-rust-${RUST_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-2.36-exiftool-12.60
   variables:
     FIPS_MODE: 1
 
 workhorse:test race:
   extends: .workhorse:test
+  parallel:
+    matrix:
+      - REDIS_VERSION: ["7.0", "6.2"]
   script:
     - make -C workhorse test-race

.gitlab/issue_templates/Geo Replicate a new Git repository type.md

@@ -430,7 +430,6 @@ That's all of the required database changes.
     let(:model_record) { build(:cool_widget) }
 
     include_examples 'a repository replicator'
-    include_examples 'a verifiable replicator'
   end
   ```
 
@@ -509,7 +508,6 @@ That's all of the required database changes.
     end
 
     include_examples 'a Geo framework registry'
-    include_examples 'a Geo verifiable registry'
   end
   ```
 

.gitlab/issue_templates/Geo Replicate a new blob type.md

@@ -387,7 +387,6 @@ That's all of the required database changes.
     let(:model_record) { build(:cool_widget) }
 
     include_examples 'a blob replicator'
-    include_examples 'a verifiable replicator'
   end
   ```
 
@@ -466,7 +465,6 @@ That's all of the required database changes.
     end
 
     include_examples 'a Geo framework registry'
-    include_examples 'a Geo verifiable registry'
   end
   ```