.gitlab-ci.yml

@@ -54,6 +54,9 @@ default:
 .if-not-security-canonical-sync: &if-not-security-canonical-sync
   if: '$CI_MERGE_REQUEST_SOURCE_PROJECT_PATH != "gitlab-org/security/gitlab" || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_DEFAULT_BRANCH'
 
+.if-merge-request-labels-run-with-rails-next: &if-merge-request-labels-run-with-rails-next
+  if: '($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-with-rails-next/'
+
 workflow:
   name: '$PIPELINE_NAME'
   rules:
@@ -101,6 +104,10 @@ workflow:
         <<: [*next-ruby-variables, *default-merge-request-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.'
+    - <<: *if-merge-request-labels-run-with-rails-next
+      variables:
+        <<: [*next-ruby-variables, *default-merge-request-variables]
+        BUNDLE_GEMFILE: Gemfile.next
     # For (detached) merge request pipelines.
     - if: '$CI_MERGE_REQUEST_IID'
       variables:
@@ -171,6 +178,7 @@ variables:
   BUNDLE_WITHOUT: "production:development"
   BUNDLE_INSTALL_FLAGS: "--jobs=$(nproc) --retry=3"
   BUNDLE_FROZEN: "true"
+  BUNDLE_GEMFILE: Gemfile
   # we override the max_old_space_size to prevent OOM errors
   NODE_OPTIONS: --max_old_space_size=5120
   GIT_DEPTH: "20"

.gitlab/CODEOWNERS

@@ -381,6 +381,15 @@ Dangerfile
 /spec/frontend/diffs/
 /spec/frontend/batch_comments/
 
+# Remove when completed: https://gitlab.com/gitlab-org/gitlab/-/issues/474653
+[Merge Requests Vuex to Pinia migration DRI] @slashmanov @iamphill @thomasrandolph
+/app/assets/javascripts/notes/stores/
+/app/assets/javascripts/mr_notes/store/
+/app/assets/javascripts/diffs/stores/
+/spec/frontend/notes/stores/
+/spec/frontend/mr_notes/stores/
+/spec/frontend/diffs/store/
+
 ^[Product Analytics] @gitlab-org/analytics-section/product-analytics/engineers/frontend
 /ee/app/assets/javascripts/analytics/analytics_dashboards/components/analytics_dashboard.vue
 /ee/app/assets/javascripts/analytics/analytics_dashboards/components/analytics_visualization_designer.vue

.gitlab/ci/dev-fixtures.gitlab-ci.yml

@@ -10,6 +10,8 @@
     FIXTURE_PATH: "db/fixtures/development"
     SEED_VSA: "true"
     SEED_PRODUCTIVITY_ANALYTICS: "true"
+    SEED_CUSTOMIZABLE_CYCLE_ANALYTICS: "true"
+    SEED_CI_CD_ANALYTICS: "true"
     VSA_ISSUE_COUNT: 1
     SIZE: 0  # number of external projects to fork, requires network connection
     # SEED_NESTED_GROUPS: "false" # requires network connection
@@ -21,7 +23,7 @@
 run-dev-fixtures:
   extends:
     - .run-dev-fixtures
-    - .dev-fixtures:rules:ee-and-foss
+    - .dev-fixtures:rules:foss-only
   script:
     - *run-dev-fixtures-script
 

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

@@ -33,7 +33,7 @@
         if ! gitlab_assets_archive_doesnt_exist; then
           # We remove all assets from the native cache as they could pollute the fresh assets from the package
           rm -rf public/assets/ app/assets/javascripts/locale/**/app.js
-          run_timed_command "download_and_extract_gitlab_assets"
+          run_timed_command "retry download_and_extract_gitlab_assets"
         fi
       fi
     - assets_compile_script

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

@@ -16,7 +16,7 @@
     - export GOPATH=$CI_PROJECT_DIR/.go
     - mkdir -p $GOPATH
     - source scripts/utils.sh
-    - log_disk_usage # https://gitlab.com/gitlab-org/gitlab/-/issues/478880
+    - log_disk_usage before_script # https://gitlab.com/gitlab-org/gitlab/-/issues/478880
 
 .default-before_script:
   before_script:
@@ -39,7 +39,7 @@
     GITLAB_ALLOW_SEPARATE_CI_DATABASE: "true"
 
 .ruby-gems-cache: &ruby-gems-cache
-  key: "ruby-gems-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}"
+  key: "ruby-gems-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-gemfile-${BUNDLE_GEMFILE}"
   paths:
     - vendor/ruby/
   policy: pull
@@ -49,7 +49,7 @@
   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-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}"
+  key: "ruby-coverage-gems-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-gemfile-${BUNDLE_GEMFILE}"
   paths:
     - vendor/ruby/
   policy: pull
@@ -101,7 +101,7 @@
   policy: push  # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
 
 .assets-tmp-cache: &assets-tmp-cache
-  key: "assets-tmp-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-node-${NODE_ENV}-v1"
+  key: "assets-tmp-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-gemfile-${BUNDLE_GEMFILE}-node-${NODE_ENV}-v1"
   paths:
     - tmp/cache/assets/sprockets/
     - tmp/cache/babel-loader/
@@ -123,7 +123,7 @@
   policy: push  # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
 
 .rubocop-cache: &rubocop-cache
-  key: "rubocop-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}"
+  key: "rubocop-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-gemfile-${BUNDLE_GEMFILE}"
   paths:
     - tmp/rubocop_cache/
   policy: pull
@@ -136,7 +136,7 @@
 
 .qa-ruby-gems-cache: &qa-ruby-gems-cache
   key:
-    prefix: "qa-ruby-gems-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}"
+    prefix: "qa-ruby-gems-${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-gemfile-${BUNDLE_GEMFILE}"
     files:
       - qa/Gemfile.lock
   paths:

.gitlab/ci/observability-backend.gitlab-ci.yml

@@ -4,8 +4,6 @@
 .e2e-observability-backend-base:
   stage: test
   needs: []
-  extends:
-    - .observability-backend:rules
   inherit:
     variables: false
   variables:
@@ -20,7 +18,9 @@
 # is a different codebase, we match branch names without
 # commit SHA.
 e2e:observability-backend:
-  extends: .e2e-observability-backend-base
+  extends:
+    - .e2e-observability-backend-base
+    - .observability-backend-current-branch:rules
   trigger:
     project: gitlab-org/opstrace/opstrace
     branch: $CI_COMMIT_REF_NAME
@@ -33,7 +33,9 @@ e2e:observability-backend:
 # and this manual job increases dev velocity
 # and testing reliablity.
 e2e:observability-backend-main-branch:
-  extends: .e2e-observability-backend-base
+  extends:
+    - .e2e-observability-backend-base
+    - .observability-backend-main-branch:rules
   trigger:
     project: gitlab-org/opstrace/opstrace
     branch: main

.gitlab/ci/preflight.gitlab-ci.yml

@@ -11,6 +11,7 @@
     - .qa-cache
   variables:
     USE_BUNDLE_INSTALL: "false"
+    BUNDLE_GEMFILE: "Gemfile"
     SETUP_DB: "false"
   before_script:
     - !reference [.default-before_script, before_script]

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

@@ -6,7 +6,7 @@ workflow:
 
 include:
   - local: .gitlab/ci/version.yml
-  - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@8.20.0"
+  - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@8.21.0"
     inputs:
       job_name: "e2e-test-report"
       job_stage: "report"
@@ -16,7 +16,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.20.0
+    ref: 8.21.0
     file:
       - /ci/base.gitlab-ci.yml
       - /ci/knapsack-report.yml

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

@@ -18,4 +18,4 @@ variables:
   # Retry failed specs in separate process
   QA_RETRY_FAILED_SPECS: "true"
   # helm chart ref used by test-on-cng pipeline
-  GITLAB_HELM_CHART_REF: "da231f62fc4157de23850d1b5b23aabc71a8f6b5"
+  GITLAB_HELM_CHART_REF: "e7f459ab671d8fdaecddd34c739e3d53c498bae2"

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

@@ -7,6 +7,7 @@
   needs: []
   variables:
     USE_BUNDLE_INSTALL: "false"
+    BUNDLE_GEMFILE: "Gemfile"
     SETUP_DB: "false"
   before_script:
     - !reference [.default-before_script, before_script]
@@ -229,6 +230,22 @@ e2e:test-on-gdk:
     SKIP_MESSAGE: Skipping test-on-gdk due to mr containing only quarantine changes!
     GDK_IMAGE: "${CI_REGISTRY_IMAGE}/gitlab-qa-gdk:${CI_COMMIT_SHA}"
 
+e2e:test-product-analytics:
+  extends:
+    - .qa:rules:e2e:test-on-gdk
+  stage: qa
+  allow_failure: true
+  variables:
+    PIPELINE_NAME: E2E Product Analytics
+    GDK_IMAGE: "${CI_REGISTRY_IMAGE}/gitlab-qa-gdk:${CI_COMMIT_SHA}"
+    GITLAB_QA_IMAGE: "${CI_REGISTRY_IMAGE}/gitlab-ee-qa:${CI_COMMIT_SHA}"
+  needs:
+    - build-gdk-image
+    - build-qa-image
+  trigger:
+    project: gitlab-org/analytics-section/product-analytics/product-analytics-devkit-mirror
+    strategy: depend
+
 e2e:test-on-cng:
   extends:
     - .e2e-trigger-base

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

@@ -102,6 +102,7 @@ include:
     - rspec_section rspec_parallelized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~level:background_migration --tag ~click_house"
   after_script:
     - source scripts/utils.sh
+    - log_disk_usage after_script # https://gitlab.com/gitlab-org/gitlab/-/issues/478880
     - bundle exec gem list gitlab_quality-test_tooling
     - |
       section_start "failed-test-issues" "Report test failures"

.gitlab/ci/release-environments/security.gitlab-ci.yml

@@ -6,7 +6,7 @@ include:
     inputs:
       cng_path: 'charts/components/images'
   - project: 'gitlab-org/quality/pipeline-common'
-    ref: '8.20.0'
+    ref: '8.21.0'
     file: ci/base.gitlab-ci.yml
 
 stages:

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

@@ -102,6 +102,12 @@
 .if-merge-request-labels-run-all-e2e: &if-merge-request-labels-run-all-e2e
   if: '($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-all-e2e/'
 
+.if-merge-request-labels-run-observability-e2e-tests-main-branch: &if-merge-request-labels-run-observability-e2e-tests-main-branch
+  if: '($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-observability-e2e-tests-main-branch/'
+
+.if-merge-request-labels-run-observability-e2e-tests-current-branch: &if-merge-request-labels-run-observability-e2e-tests-current-branch
+  if: '($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-observability-e2e-tests-current-branch/'
+
 .if-merge-request-labels-run-single-db: &if-merge-request-labels-run-single-db
   if: '($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-single-db/'
 
@@ -699,6 +705,23 @@
   - "qa/gems/gitlab-cng/**/*.rb"
   - "qa/gems/gitlab-cng/{Gemfile,Gemfile.lock}"
 
+.observability-code-patterns: &observability-code-patterns
+  # backend
+  - "ee/app/helpers/observability/*"
+  - "ee/app/helpers/projects/observability_helper.rb"
+  - "lib/gitlab/observability.rb"
+  - "ee/lib/ee/gitlab/observability.rb"
+  - "ee/lib/api/internal/observability.rb"
+  - "ee/app/controllers/projects/tracing_controller.rb"
+  - "ee/app/controllers/projects/metrics_controller.rb"
+  - "ee/app/controllers/projects/logs_controller.rb"
+  - "ee/app/services/observability/**/*"
+  # frontend
+  - "app/assets/javascripts/observability/*"
+  - "ee/app/assets/javascripts/logs/*"
+  - "ee/app/assets/javascripts/metrics/*"
+  - "ee/app/assets/javascripts/tracing/*"
+
 ##################
 # Conditions set #
 ##################
@@ -921,13 +944,17 @@
     - if: '$ENABLE_BUILD_QA_IMAGE == "true"'
     - <<: *if-merge-request-labels-run-all-e2e
     - <<: *if-merge-request-labels-run-review-app
+    - <<: *if-merge-request
+      changes: *ruby-version-patterns
     - <<: *if-merge-request
       changes: *qa-patterns
+    - <<: *if-merge-request
+      changes: *gitaly-patterns
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
     - <<: *if-merge-request
       changes: *ci-build-images-patterns
-    - !reference [".prevent-tier-2-and-below", rules]
+    - !reference [".prevent-tier-1", rules]
     - <<: *if-merge-request
       changes: *code-qa-patterns
     # Rules to support .qa:rules:package-and-test-ee
@@ -939,7 +966,12 @@
       changes: *nodejs-patterns
     - <<: *if-merge-request
       changes: *ci-qa-patterns
+    - <<: *if-merge-request
+      changes: *gdk-component-patterns
 
+# These rules have to include rules from ".qa:rules:e2e:test-on-gdk" which are also used
+# for "e2e:test-product-analytics" job in "qa.gitkab-ci.yml".
+# "e2e:test-product-analytics" job requires QA image to be built.
 .build-images:rules:build-qa-image:
   rules:
     - <<: *if-not-canonical-namespace
@@ -1111,8 +1143,10 @@
 ######################
 # Dev fixtures rules #
 ######################
-.dev-fixtures:rules:ee-and-foss:
+.dev-fixtures:rules:foss-only:
   rules:
+    - <<: *if-not-foss
+      when: never
     - <<: *if-merge-request-labels-pipeline-expedite
       when: never
     - <<: *if-default-refs
@@ -1784,7 +1818,6 @@
     # - <<: *if-merge-request
     #   changes: *cng-orchestrator-patterns
 
-
 .qa:rules:package-and-test-nightly:
   rules:
     - !reference [".qa:rules:package-and-test-never-run", rules]
@@ -3318,14 +3351,28 @@
 ###############################
 # Observability Backend rules #
 ###############################
-.observability-backend:rules:
+.observability-backend-main-branch:rules:
   rules:
+    - <<: *if-merge-request-labels-run-observability-e2e-tests-current-branch
+      when: never
+    - <<: *if-merge-request-labels-run-observability-e2e-tests-main-branch
+      allow_failure: true
+    - <<: *if-merge-request
+      changes: *observability-code-patterns
+      allow_failure: true
     - <<: *if-merge-request
       changes: *code-patterns
       when: manual
       allow_failure: true
+
+.observability-backend-current-branch:rules:
+  rules:
+    - <<: *if-merge-request-labels-run-observability-e2e-tests-main-branch
+      when: never
+    - <<: *if-merge-request-labels-run-observability-e2e-tests-current-branch
+      allow_failure: true
     - <<: *if-merge-request
-      changes: *ci-patterns
+      changes: *code-patterns
       when: manual
       allow_failure: true
 

.gitlab/ci/vendored-gems.gitlab-ci.yml

@@ -53,5 +53,5 @@ include:
       gem_path_prefix: "vendor/gems/"
   - local: .gitlab/ci/templates/gem.gitlab-ci.yml
     inputs:
-      gem_name: "sidekiq-7.1.6"
+      gem_name: "sidekiq-7.2.4"
       gem_path_prefix: "vendor/gems/"

.gitlab/issue_templates/Pipeline Authoring Issue Implementation.md

-<!--
-## Implementation Issue To-Do list 
-(_NOTE: This section can be removed when the issue is ready for creation_)
-- [ ] Ensure that issue title is concise yet descriptive
-- [ ] Add `Frontend :` or `Backend: ` per group [naming conventions](https://about.gitlab.com/handbook/engineering/development/ops/verify/pipeline-authoring/#splitting-issues)
-- [ ] Ensure the issue containing the feature or change proposal and related discussions is linked as related to this implementation issue.
-- [ ] Aside from default labeling, please make sure to include relevant labels for `type::`, `workflow::`, and `~frontend`/`~backend` labeling.
-- [ ] Issues with user-facing changes should include the `~UX` label.
--->
-
-## Summary
-
-## Proposal
-
-## Confirm purpose and User Reception (how does this benefit the user?)
-
-## Additional details
-<!--
-_NOTE: If the issue has addressed all of these questions, this separate section can be removed._
--->
-
-Some relevant technical details, if applicable, such as:
-
-- Does this need a ~"feature flag"?
-- Does there need to be an associated ~"instrumentation" issue created related to this work?
-- Is there an example response showing the data structure that should be returned (new endpoints only)?
-- What permissions should be used?
-- Is this EE or CE?
-    - [ ] EE
-    - [ ] CE
-- Additional comments:
-
-## Implementation Table
-
-<!--
-_NOTE: If the issue is not part of an epic, the implementation table can be removed. If it is part of an epic, make sure that the implementation table below mirrors the corresponding epic's implementation table content._
--->
-
-
-| Group | Issue Link |
-| ------ | ------ |
-| ~backend | :point_left: You are here |
-| ~frontend | [#123123](url) |
-
-<!--
-## Documentation 
-
-_NOTE: This section is optional, but can be used for easy access to any relevant documentation URLs._
--->
-
-## Links/References
-
-
-
-
-/label ~"group::pipeline authoring" ~"Category:Pipeline Composition" ~"section::ci" ~"devops::verify" ~"workflow::planning breakdown"

.gitlab/issue_templates/Pipeline Authoring Issue.md

+## Summary
+<!--
+required
+
+Confirm the purpose and expected user reception, especially: How does this benefit the user?
+-->
+
+## Definition of Done
+<!-- required -->
+<!-- What is needed in order for this issue to be released? -->
+
+<!-- Example: 
+- Users can drill down in the pipeline to view at a stage level
+- The feature flag is rolled out 
+- Relevant documentation is added or updated
+- Relevant test coverages of all testing requirements are added or updated
+-->
+
+## Details
+<!--  
+Optional (when design needed):
+
+#### Design spec
+- [Figma dev 🔗](Figma board link)
+- [Design tab 👉](Design tab link)
+-->
+
+## Roles involved
+<!-- to be checked by ICs -->
+- [ ] Design
+- [ ] Technical Writing
+- [ ] Backend
+- [ ] Frontend
+- [ ] Test engineering
+
+**NOTE:** When work is ready to be defined, please create appropriate sub-tasks.
+
+/label ~"group::pipeline authoring" ~"Category:Pipeline Composition" ~"section::ci" ~"devops::verify"

.prettierrc

 {
+  "plugins": ["prettier-plugin-tailwindcss"],
+  "tailwindConfig": "./config/tailwind.config.js",
   "printWidth": 100,
   "singleQuote": true,
   "arrowParens": "always",

.rubocop_todo/database/avoid_using_pluck_without_limit.yml

@@ -54,7 +54,6 @@ Database/AvoidUsingPluckWithoutLimit:
     - 'app/models/project.rb'
     - 'app/models/project_authorizations/changes.rb'
     - 'app/models/project_team.rb'
-    - 'app/models/prometheus_alert.rb'
     - 'app/models/protected_branch.rb'
     - 'app/models/remote_mirror.rb'
     - 'app/models/shard.rb'

.rubocop_todo/gitlab/avoid_current_organization.yml

+---
+Gitlab/AvoidCurrentOrganization:
+  Details: grace period
+  Exclude:
+    - 'app/services/snippets/create_service.rb'
+    - 'lib/gitlab/current_settings.rb'
+    - 'lib/gitlab/github_gists_import/importer/gist_importer.rb'

.rubocop_todo/gitlab/bounded_contexts.yml

@@ -783,7 +783,6 @@ Gitlab/BoundedContexts:
     - 'app/models/bulk_imports/tracker.rb'
     - 'app/models/chat_name.rb'
     - 'app/models/chat_team.rb'
-    - 'app/models/ci_platform_metric.rb'
     - 'app/models/commit.rb'
     - 'app/models/commit_collection.rb'
     - 'app/models/commit_range.rb'
@@ -797,7 +796,6 @@ Gitlab/BoundedContexts:
     - 'app/models/concerns/acts_as_paginated_diff.rb'
     - 'app/models/concerns/admin_changed_password_notifier.rb'
     - 'app/models/concerns/after_commit_queue.rb'
-    - 'app/models/concerns/alert_event_lifecycle.rb'
     - 'app/models/concerns/approvable.rb'
     - 'app/models/concerns/as_cte.rb'
     - 'app/models/concerns/async_devise_email.rb'
@@ -1214,8 +1212,6 @@ Gitlab/BoundedContexts:
     - 'app/models/project_statistics.rb'
     - 'app/models/project_team.rb'
     - 'app/models/project_wiki.rb'
-    - 'app/models/prometheus_alert.rb'
-    - 'app/models/prometheus_alert_event.rb'
     - 'app/models/prometheus_metric.rb'
     - 'app/models/protectable_dropdown.rb'
     - 'app/models/protected_branch.rb'
@@ -1378,7 +1374,6 @@ Gitlab/BoundedContexts:
     - 'app/policies/project_policy.rb'
     - 'app/policies/project_snippet_policy.rb'
     - 'app/policies/project_statistics_policy.rb'
-    - 'app/policies/prometheus_alert_policy.rb'
     - 'app/policies/protected_branch_access_policy.rb'
     - 'app/policies/protected_branch_policy.rb'
     - 'app/policies/release_policy.rb'