.eslint_todo/vue-no-unused-properties.mjs

@@ -593,9 +593,6 @@ export default {
     'ee/app/assets/javascripts/tracing/details/tracing_details.vue',
     'ee/app/assets/javascripts/usage_quotas/code_suggestions/components/code_suggestions_info_card.vue',
     'ee/app/assets/javascripts/usage_quotas/code_suggestions/components/search_and_sort_bar.vue',
-    'ee/app/assets/javascripts/usage_quotas/pipelines/components/app.vue',
-    'ee/app/assets/javascripts/usage_quotas/pipelines/components/minutes_usage_per_project_chart.vue',
-    'ee/app/assets/javascripts/usage_quotas/pipelines/components/shared_runner_usage_month_chart.vue',
     'ee/app/assets/javascripts/usage_quotas/seats/components/statistics_seats_card.vue',
     'ee/app/assets/javascripts/usage_quotas/transfer/components/usage_by_month.vue',
     'ee/app/assets/javascripts/users/identity_verification/components/credit_card_verification.vue',

.gitlab-ci.yml

@@ -48,6 +48,7 @@ default:
   ADD_SLOW_TEST_NOTE_TO_MERGE_REQUEST: "true"
   FF_NETWORK_PER_BUILD: "true"
   FF_TIMESTAMPS: "true"
+  FF_USE_FASTZIP: "true"
 
 .if-merge-request-security-canonical-sync: &if-merge-request-security-canonical-sync
   if: '$CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == "gitlab-org/security/gitlab" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH'
@@ -241,9 +242,8 @@ variables:
   RETRY_FAILED_TESTS_IN_NEW_PROCESS: "true"
   # Run with decomposed databases by default
   DECOMPOSED_DB: "true"
-  SEC_DECOMPOSED_DB: "false"
+  SEC_DECOMPOSED_DB: "true"
 
-  DOCS_REVIEW_APPS_DOMAIN: "docs.gitlab-review.app"
   DOCS_GITLAB_REPO_SUFFIX: "ee"
 
   REVIEW_APPS_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}:gcloud-${GCLOUD_VERSION}-kubectl-1.30-helm-${HELM_VERSION}"

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

@@ -48,7 +48,7 @@ build-gdk-image:
     - .base-image-build-buildx
     - .build-images:rules:build-gdk-image
   tags:
-    - docker
+    - $GITLAB_LARGE_RUNNER_OPTIONAL
   stage: build-images
   needs:
     - job: gdk:compile-test-assets

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

@@ -22,7 +22,7 @@
 review-docs-deploy:
   extends: .review-docs
   script:
-    - ./scripts/trigger-build.rb docs-hugo deploy
+    - ./scripts/trigger-build.rb docs deploy
 
 # Cleanup remote environment of gitlab-org/technical-writing/docs-gitlab-com
 review-docs-cleanup:
@@ -31,7 +31,7 @@ review-docs-cleanup:
     name: review-docs/mr-${CI_MERGE_REQUEST_IID}
     action: stop
   script:
-    - ./scripts/trigger-build.rb docs-hugo cleanup
+    - ./scripts/trigger-build.rb docs cleanup
 
 .docs-markdown-lint-image:
   # When updating the image version here, update it in /scripts/lint-doc.sh too.

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

@@ -105,6 +105,15 @@ include:
       variables:
         QA_RSPEC_TAGS: "--tag ~smoke --tag ~orchestrated --tag ~skip_live_env"
 
+.rules:test:dependency-update:
+  rules:
+    - if: '$DEPENDENCY_UPDATE == "true"'
+
+.rules:test:dependency-update-never:
+  rules:
+    - if: '$DEPENDENCY_UPDATE == "true"'
+      when: never
+
 # ------------------------------------------
 # Report
 # ------------------------------------------

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

@@ -19,13 +19,18 @@ setup-test-env:
   variables:
     SETUP_DB: "false"
   script:
-    - echo $CI_MERGE_REQUEST_APPROVED
-    - source scripts/gitlab_component_helpers.sh
-    - run_timed_command "download_and_extract_gitlab_workhorse_package" || true
-    - section_start "setup-test-env" "Setting up testing environment"; scripts/setup-test-env; section_end "setup-test-env";
-    - select_gitlab_workhorse_essentials
-    - section_start "gitaly-test-build" "Compiling Gitaly binaries"; scripts/gitaly-test-build; section_end "gitaly-test-build";  # Do not use 'bundle exec' here
-    - strip_executable_binaries "${TMP_TEST_FOLDER}"
+    - |
+      function setup_test_env() {
+        echo $CI_MERGE_REQUEST_APPROVED
+        source scripts/gitlab_component_helpers.sh
+        run_timed_command "download_and_extract_gitlab_workhorse_package" || true
+        section_start "setup-test-env" "Setting up testing environment"; scripts/setup-test-env; section_end "setup-test-env";
+        select_gitlab_workhorse_essentials
+        section_start "gitaly-test-build" "Compiling Gitaly binaries"; scripts/gitaly-test-build; section_end "gitaly-test-build";  # Do not use 'bundle exec' here
+        strip_executable_binaries "${TMP_TEST_FOLDER}"
+      }
+
+      run_with_custom_exit_code setup_test_env
   artifacts:
     expire_in: 7d
     paths:

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

@@ -46,6 +46,11 @@
 .if-default-branch-refs: &if-default-branch-refs
   if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID == null'
 
+# This rule ensures the job runs for push pipeline events on stable branches.
+# This is used for ensuring jobs run in a pipeline triggered by mirror sync.
+.if-sync-changes-on-stable-branches: &if-sync-changes-on-stable-branches
+  if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/'
+
 .if-auto-deploy-branches: &if-auto-deploy-branches
   if: '$CI_COMMIT_BRANCH =~ /^\d+-\d+-auto-deploy-\d+$/'
 
@@ -115,8 +120,8 @@
 .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/'
 
-.if-merge-request-labels-sec-decomposition: &if-merge-request-labels-sec-decomposition
-  if: '($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") && $CI_MERGE_REQUEST_LABELS =~ /sec-decomposition/'
+.if-merge-request-labels-pipeline-single-db-sec-connection: &if-merge-request-labels-pipeline-single-db-sec-connection
+  if: '($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:single-db-sec-connection/'
 
 .if-merge-request-labels-run-review-app: &if-merge-request-labels-run-review-app
   if: '($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-review-app/'
@@ -265,6 +270,14 @@
   - "GITALY_SERVER_VERSION"
   - "lib/gitlab/setup_helper.rb"
 
+# versions of all these components can affect cloud native deployment
+.cng-dependency-patterns: &cng-dependency-patterns
+  - GITLAB_WORKHORSE_VERSION
+  - GITLAB_SHELL_VERSION
+  - GITLAB_KAS_VERSION
+  - GITLAB_PAGES_VERSION
+  - GITALY_SERVER_VERSION
+
 .workhorse-patterns: &workhorse-patterns
   - ".gitlab/ci/version.yml"
   - ".gitlab/ci/workhorse.gitlab-ci.yml"
@@ -1121,6 +1134,7 @@
       when: never
     - if: '$ENABLE_BUILD_ASSETS_IMAGE == "true"'
     - <<: *if-tag
+    - <<: *if-sync-changes-on-stable-branches
     - !reference [".frontend:rules:assets-shared", rules]
     # Always build on stable branches to serve release-environments pipeline
     # Do not refer directly to .release-environments:rules:start-release-environments-security-pipeline
@@ -1318,6 +1332,8 @@
     - <<: *if-merge-request-labels-run-review-app
     - <<: *if-merge-request
       changes: *qa-patterns
+    - <<: *if-merge-request
+      changes: *cng-dependency-patterns
     - <<: *if-merge-request-targeting-stable-branch
       changes: *setup-test-env-patterns
     - <<: *if-default-refs
@@ -1339,6 +1355,7 @@
       when: never
     - if: '$ENABLE_COMPILE_PRODUCTION_ASSETS == "true"'
     - <<: *if-tag
+    - <<: *if-sync-changes-on-stable-branches
     - !reference [".frontend:rules:assets-shared", rules]
     # Always build on stable branches to serve release-environments pipeline
     # Do not refer directly to .release-environments:rules:start-release-environments-security-pipeline
@@ -1809,7 +1826,8 @@
     - <<: *if-merge-request
       changes: *dependency-patterns
       variables:
-        OMNIBUS_GITLAB_BUILD_ON_ALL_OS: 'true'
+        OMNIBUS_GITLAB_BUILD_ON_ALL_OS: "true"
+        DEPENDENCY_UPDATE: "true"
     - <<: *if-merge-request
       changes: *code-qa-patterns
       when: manual
@@ -1886,14 +1904,14 @@
       when: never
     - <<: *if-security-schedule
       when: never
+    - <<: *if-merge-request
+      changes: *cng-dependency-patterns
     - !reference [".qa:rules:e2e-blocking-base-before", rules]
     - !reference [".prevent-tier-2-and-below", rules]
     - !reference [".qa:rules:e2e-blocking-base-after", rules]
     - !reference [".qa:rules:e2e-schedule-nightly", rules]
     - <<: *if-dot-com-gitlab-org-schedule
-      variables:
-        <<: *qa-e2e-test-schedule-variables
-        QA_RUN_IN_PARALLEL: "true"
+      variables: *qa-e2e-test-schedule-variables
 
 .qa:rules:test-on-omnibus-nightly:
   rules:
@@ -2008,7 +2026,7 @@
   rules:
     - <<: *if-default-branch-schedule-nightly
     - <<: *if-merge-request-labels-run-single-db
-    - <<: *if-merge-request-labels-sec-decomposition
+    - <<: *if-merge-request-labels-pipeline-single-db-sec-connection
     - <<: *if-merge-request-labels-pipeline-expedite
       when: never
     - if: '$ENABLE_RSPEC_SINGLE_DB_SEC_CONNECTION == "true"'
@@ -2024,7 +2042,7 @@
 .rails:rules:db:check-migrations-single-db-sec-connection:
   rules:
     - <<: *if-merge-request-labels-run-single-db
-    - <<: *if-merge-request-labels-sec-decomposition
+    - <<: *if-merge-request-labels-pipeline-single-db-sec-connection
     - <<: *if-merge-request-labels-pipeline-expedite
       when: never
 

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

@@ -6,6 +6,9 @@ include:
   - local: .gitlab/ci/qa-common/variables.gitlab-ci.yml
   - local: .gitlab/ci/qa-common/omnibus.gitlab-ci.yml
 
+variables:
+  QA_PARALLEL_PROCESSES: 6
+
 # ==========================================
 # Prepare stage
 # ==========================================
@@ -28,7 +31,6 @@ check-release-set:
 _quarantine:
   extends:
     - .qa
-    - .rules:test:manual-except-default-branch
   stage: test
   variables:
     QA_RSPEC_TAGS: --tag quarantine
@@ -39,11 +41,25 @@ _quarantine:
     expire_in: 1 day
     paths:
       - gitlab-qa-run-*/**/test-metrics-*.json
+  rules:
+    - !reference [.rules:test:dependency-update-never, rules]
+    - !reference [.rules:test:manual-except-default-branch, rules]
 
 # ------------------------------------------
 # Test jobs
 # ------------------------------------------
 
+# Execute smallest test suite to validate omnibus package in dependency update merge request pipelines
+health-check:
+  extends:
+    - .qa
+  variables:
+    QA_SCENARIO: Test::Instance::Image
+    QA_RUN_IN_PARALLEL: true
+    QA_RSPEC_TAGS: --tag health_check
+  rules:
+    - !reference [.rules:test:dependency-update, rules]
+
 # ========== instance ===========
 instance:
   extends:
@@ -52,8 +68,8 @@ instance:
   variables:
     QA_SCENARIO: Test::Instance::Image
     QA_RUN_IN_PARALLEL: true
-    QA_PARALLEL_PROCESSES: 6
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - !reference [.rules:test:smoke-for-omnibus-mr, rules]
     - if: $QA_SUITES =~ /Test::Instance::All/
 
@@ -68,6 +84,7 @@ praefect:
     QA_CAN_TEST_PRAEFECT: "true"
     QA_GITALY_TRANSACTIONS_ENABLED: "false"
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - !reference [.rules:test:smoke-for-omnibus-mr, rules]
     - if: $QA_SUITES =~ /Test::Instance::Create/
 
@@ -84,8 +101,8 @@ gitaly-transactions:
     QA_CAN_TEST_PRAEFECT: "true"
     QA_GITALY_TRANSACTIONS_ENABLED: "true"
     QA_RUN_IN_PARALLEL: true
-    QA_PARALLEL_PROCESSES: 6
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Instance::Create/
 
 # ========== gitaly reftables backend ===========
@@ -103,6 +120,7 @@ gitaly-reftables-backend:
     QA_CAN_TEST_PRAEFECT: "true"
     QA_FEATURE_FLAGS: "gitaly_new_repo_reftable_backend=enabled"
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Instance::Create/
 
 # ========== git sha256 enabled ===========
@@ -117,6 +135,7 @@ git-sha256-repositories:
     QA_USE_SHA256_REPOSITORY_OBJECT_STORAGE: true
     GITLAB_QA_OPTS: "--enable-feature support_sha256_repositories"
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Instance::All/
 
 gitaly-cluster:
@@ -124,6 +143,7 @@ gitaly-cluster:
   variables:
     QA_SCENARIO: Test::Integration::GitalyCluster
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::GitalyCluster/
 
 group-saml:
@@ -143,6 +163,7 @@ oauth:
     QA_RSPEC_TAGS: --tag oauth
     GITLAB_QA_OPTS: --omnibus-config github_oauth
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::OAuth/
 
 instance-saml:
@@ -150,6 +171,7 @@ instance-saml:
   variables:
     QA_SCENARIO: Test::Integration::InstanceSAML
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::InstanceSAML/
 
 jira:
@@ -158,6 +180,7 @@ jira:
   variables:
     QA_SCENARIO: Test::Integration::Jira
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::Jira/
 
 integrations:
@@ -165,6 +188,7 @@ integrations:
   variables:
     QA_SCENARIO: Test::Integration::Integrations
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::Integrations/
 
 ldap-no-server:
@@ -172,6 +196,7 @@ ldap-no-server:
   variables:
     QA_SCENARIO: Test::Integration::LDAPNoServer
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::LDAPNoServer/
 
 ldap-tls:
@@ -179,6 +204,7 @@ ldap-tls:
   variables:
     QA_SCENARIO: Test::Integration::LDAPTLS
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::LDAPTLS/
 
 ldap-no-tls:
@@ -186,6 +212,7 @@ ldap-no-tls:
   variables:
     QA_SCENARIO: Test::Integration::LDAPNoTLS
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::LDAPNoTLS/
 
 mtls:
@@ -193,6 +220,7 @@ mtls:
   variables:
     QA_SCENARIO: Test::Integration::MTLS
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::Mtls/
 
 mattermost:
@@ -201,6 +229,7 @@ mattermost:
   variables:
     QA_SCENARIO: Test::Integration::Mattermost
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::Mattermost/
 
 registry:
@@ -209,6 +238,7 @@ registry:
   variables:
     QA_SCENARIO: Test::Integration::Registry
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::Registry/
 
 repository-storage:
@@ -217,6 +247,7 @@ repository-storage:
   variables:
     QA_SCENARIO: Test::Instance::RepositoryStorage
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Instance::RepositoryStorage/
 
 service-ping-disabled:
@@ -226,6 +257,7 @@ service-ping-disabled:
   variables:
     QA_SCENARIO: Test::Integration::ServicePingDisabled
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::ServicePingDisabled/
 
 smtp:
@@ -234,6 +266,7 @@ smtp:
   variables:
     QA_SCENARIO: Test::Integration::SMTP
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::SMTP/
 
 cloud-activation:
@@ -243,6 +276,7 @@ cloud-activation:
     QA_SCENARIO: Test::Instance::Image
     QA_RSPEC_TAGS: --tag cloud_activation
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Instance::CloudActivation/
 
 metrics:
@@ -250,6 +284,7 @@ metrics:
   variables:
     QA_SCENARIO: Test::Integration::Metrics
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::Metrics/
 
 elasticsearch:
@@ -260,6 +295,7 @@ elasticsearch:
   before_script:
     - !reference [.qa, before_script]
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - !reference [.rules:test:ee-only, rules]
     - if: $QA_SUITES =~ /Test::Integration::Elasticsearch/
 
@@ -270,6 +306,7 @@ importers:
     QA_SCENARIO: Test::Integration::Import
     QA_MOCK_GITHUB: "true"
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::Import/
 
 import-with-smtp:
@@ -279,6 +316,7 @@ import-with-smtp:
   variables:
     QA_SCENARIO: Test::Integration::ImportWithSMTP
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::ImportWithSMTP/
 
 # ========== ai-gateway ===========
@@ -288,6 +326,7 @@ ai-gateway:
   variables:
     QA_SCENARIO: Test::Integration::AiGateway
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::AiGateway/
 
 ai-gateway-no-seat-assigned:
@@ -296,6 +335,7 @@ ai-gateway-no-seat-assigned:
   variables:
     QA_SCENARIO: Test::Integration::AiGatewayNoSeatAssigned
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::AiGatewayNoSeatAssigned/
 
 ai-gateway-no-add-on:
@@ -307,6 +347,7 @@ ai-gateway-no-add-on:
     - export QA_EE_ACTIVATION_CODE=$QA_EE_ACTIVATION_CODE_NO_ADD_ON
     - !reference [.qa, before_script]
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::AiGatewayNoAddOn/
 
 ai-gateway-no-license:
@@ -318,6 +359,7 @@ ai-gateway-no-license:
     - unset QA_EE_LICENSE
     - !reference [.qa, before_script]
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - if: $QA_SUITES =~ /Test::Integration::AiGatewayNoLicense/
 
 # ========== continuous-vulnerability-scanning ===========
@@ -329,6 +371,7 @@ continuous-vulnerabiity-scanning:
     QA_SCENARIO: Test::Integration::ContinuousVulnerabilityScanning
     QA_MOCK_GITHUB: "true"
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - !reference [.rules:test:ee-only, rules]
     - if: $QA_SUITES =~ /Test::Integration::ContinuousVulnerabilityScanning/
 
@@ -343,6 +386,7 @@ update-minor:
     UPDATE_TYPE: minor
     QA_RSPEC_TAGS: --tag health_check
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - !reference [.rules:test:update, rules]
 
 update-major:
@@ -353,6 +397,7 @@ update-major:
     UPDATE_TYPE: major
     QA_RSPEC_TAGS: --tag health_check
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - !reference [.rules:test:update, rules]
 
 update-ee-to-ce:
@@ -364,6 +409,7 @@ update-ee-to-ce:
     UPDATE_FROM_EDITION: ee
     QA_RSPEC_TAGS: --tag health_check
   rules:
+    - !reference [.rules:test:dependency-update-never, rules]
     - !reference [.rules:test:ce-only, rules]
     - !reference [.rules:test:update, rules]
 

.gitlab/issue_templates/Documentation.md

@@ -4,10 +4,10 @@
   Note: Doc work as part of feature development is covered in the Feature Request template.
 
 * For issues related to features of the docs.gitlab.com site, see
-  https://gitlab.com/gitlab-org/gitlab-docs/issues/
+  https://gitlab.com/gitlab-org/technical-writing/docs-gitlab-com/-/issues
 
 * For information about documentation content and process, see
-  https://docs.gitlab.com/ee/development/documentation/
+  https://docs.gitlab.com/development/documentation/
 -->
 
 - [ ] Start this issue's title with `Docs:` or `Docs feedback:`.

.gitlab/issue_templates/Security developer workflow.md

@@ -34,8 +34,12 @@ After your merge request has been approved according to our [approval guidelines
   - You can use the script `bin/secpick` instead of the following steps, to help you cherry-picking. See the [secpick documentation]
 - [ ] Create each MR targeting the stable branch `X-Y-stable`, using the [Security merge request template].
   - Every merge request will have its own set of to-dos, so make sure to complete those.
-- [ ]  On the `Related merge requests` section, ensure that **ONLY** `4` merge requests are associated: **ONLY** one targeting `master` and the `3` backports.
-  - [ ]  If there are more associated MRs, re-create another security issue and ensure there are only 4 merge requests associated with that one.
+- [ ]  On the `Related merge requests` section, ensure that **ONLY** `4` merge requests matching these conditions:
+  - From the security namespace (`gitlab-org/security`)
+  - Status is not `Closed`
+  - (Other MRs not matching these above conditions are acceptable)
+  - [ ] Among these `4` MRs, one targeting `master` and the `3` backports targeting stable branches.
+  - [ ] If there are more associated MRs, re-create another security issue and ensure there are only 4 merge requests associated with that one.
 - [ ] If this issue requires less than `4` merge requests, add the ~"reduced backports" label.
 
 ## Assigning to a release

.gitlab/issue_templates/Usage Data Instrumentation.md

@@ -60,7 +60,7 @@ Metrics:
 
 * [ ] Assign an engineering counterpart from your group to add instrumentation to the code
 * [ ] Explore instrumented data with the help of our [data discovery guide]( https://docs.gitlab.com/ee/development/internal_analytics/#data-discovery). You can also [reach out to product data insights team](https://gitlab.com/gitlab-data/product-analytics/-/issues/new?issuable_template=PI%20Chart%20Help) for help with generating Tableau reports/dashboards.
-* [ ] Your feedback is valuable to us. Please leave us feedback in the comment section of this issue and tag @tjayaramaraju or @basti
+* [ ] Your feedback is valuable to us. Please leave us feedback in the comment section of this issue and tag @tjayaramaraju.
 
 # Important links
 

.gitlab/merge_request_templates/Documentation SA Solutions Docs.md

@@ -12,25 +12,25 @@ This MR Template ensures that Solutions Docs published here: https://docs.gitlab
 
 ## Review
 
-- [ ] I have read the [Solutions Docs Contributors Guide in the GitLab Handbook](https://handbook.gitlab.com/handbook/customer-success/solutions-architects/sa-documentation/) and believe that this contribution complies with the scope and requirements outlined there.
+- [ ] I have read the [Solutions Architects GitLab Docs Section](https://handbook.gitlab.com/handbook/solutions-architects/sa-documentation/) and believe that this contribution complies with the scope and requirements outlined there.
 - [ ] Assign yourself as the **Assignee** of this MR.
 - [ ] Assign the latest release for the **Milestone**. If you're not sure, [view the list of releases](https://about.gitlab.com/releases/).
 - [ ] Mention the reviewers in a comment, so they're aware that the MR is ready.
-- [ ] If navigation changes are needed, create an MR in the gitlab-docs project according to this documentation process. [Here is an example](https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/4863).
-  - [ ] If making a navigation change, list the Navigation MR here: `link to your navigation update MR`
+- [ ] If navigation changes are needed, create a MR to [add a navigation entry](https://docs.gitlab.com/development/documentation/site_architecture/global_nav/#add-a-navigation-entry) in the `docs-gitlab-com` project.
+  - [ ] If making a navigation change, list the MR here: `link to your navigation update MR`.
 
 ## Merging
 
-- [ ] Obtain approval from a member of the Solutions Documentation Approvers Group (CODEOWNERS for the Solutions directory)
+- [ ] Obtain approval from a member of the Solutions Documentation Approvers Group (CODEOWNERS for the Solutions directory).
 
 When a code owner approves, they can merge.
 
 ## Troubleshooting
 
-The pipeline will test for style and link issues. If you have issues you're unable to resolve,
-view the documentation [Style Guide](https://docs.gitlab.com/ee/development/documentation/styleguide/)
-or ask for assistance in the #docs Slack channel.
+The pipeline checks for style and broken links.
+For help resolving issues, see the [Documentation Style Guide](https://docs.gitlab.com/development/documentation/styleguide/)
+or ask in the #docs Slack channel.
 
-/label ~documentation ~Solutions ~"type::maintenance" ~"maintenance::refactor" 
+/label ~documentation ~Solutions ~"type::maintenance" ~"maintenance::refactor"
 /assign me
 /request_review @DarwinJS @jmoverley

.markdownlint-cli2.yaml

@@ -162,8 +162,3 @@ config:
     ]
 ignores:
   - "doc/architecture"
-customRules:
-  - "./doc/.markdownlint/rules/tabs_blank_lines.js"
-  - "./doc/.markdownlint/rules/tabs_title_markup.js"
-  - "./doc/.markdownlint/rules/tabs_title_text.js"
-  - "./doc/.markdownlint/rules/tabs_wrapper_tags.js"

.rubocop_todo/gitlab/bounded_contexts.yml

@@ -1125,6 +1125,7 @@ Gitlab/BoundedContexts:
     - 'app/models/preloaders/commit_status_preloader.rb'
     - 'app/models/preloaders/environments/deployment_preloader.rb'
     - 'app/models/preloaders/group_policy_preloader.rb'
+    - 'app/models/preloaders/issuables_preloader.rb'
     - 'app/models/preloaders/labels_preloader.rb'
     - 'app/models/preloaders/merge_request_diff_preloader.rb'
     - 'app/models/preloaders/project_policy_preloader.rb'
@@ -2280,7 +2281,9 @@ Gitlab/BoundedContexts:
     - 'ee/app/graphql/mutations/iterations/update.rb'
     - 'ee/app/graphql/mutations/member_roles/base.rb'
     - 'ee/app/graphql/mutations/member_roles/create.rb'
-    - 'ee/app/graphql/mutations/member_roles/create_admin.rb'
+    - 'ee/app/graphql/mutations/member_roles/admin/base.rb'
+    - 'ee/app/graphql/mutations/member_roles/admin/create.rb'
+    - 'ee/app/graphql/mutations/member_roles/admin/update.rb'
     - 'ee/app/graphql/mutations/member_roles/delete.rb'
     - 'ee/app/graphql/mutations/member_roles/update.rb'
     - 'ee/app/graphql/mutations/quality_management/test_cases/create.rb'
@@ -2311,8 +2314,6 @@ Gitlab/BoundedContexts:
     - 'ee/app/graphql/resolvers/dast_site_profile_resolver.rb'
     - 'ee/app/graphql/resolvers/dast_site_validation_resolver.rb'
     - 'ee/app/graphql/resolvers/description_versions_diff_resolver.rb'
-    - 'ee/app/graphql/resolvers/dora/performance_scores_count_resolver.rb'
-    - 'ee/app/graphql/resolvers/dora_metrics_resolver.rb'
     - 'ee/app/graphql/resolvers/epic_ancestors_resolver.rb'
     - 'ee/app/graphql/resolvers/epic_issues_resolver.rb'
     - 'ee/app/graphql/resolvers/epics/children_resolver.rb'
@@ -2410,13 +2411,6 @@ Gitlab/BoundedContexts:
     - 'ee/app/graphql/types/deployments/approval_summary_status_enum.rb'
     - 'ee/app/graphql/types/deployments/approval_summary_type.rb'
     - 'ee/app/graphql/types/deployments/approval_type.rb'
-    - 'ee/app/graphql/types/dora/performance_score_connection_type.rb'
-    - 'ee/app/graphql/types/dora/performance_score_count_type.rb'
-    - 'ee/app/graphql/types/dora/project_filter_input_type.rb'
-    - 'ee/app/graphql/types/dora_metric_bucketing_interval_enum.rb'
-    - 'ee/app/graphql/types/dora_metric_type.rb'
-    - 'ee/app/graphql/types/dora_metric_type_enum.rb'
-    - 'ee/app/graphql/types/dora_type.rb'
     - 'ee/app/graphql/types/epic_descendant_count_type.rb'
     - 'ee/app/graphql/types/epic_descendant_weight_sum_type.rb'
     - 'ee/app/graphql/types/epic_health_status_type.rb'

.rubocop_todo/gitlab/documentation_links/link.yml

----
-# Cop supports --autocorrect.
-Gitlab/DocumentationLinks/Link:
-  Exclude:
-    - 'ee/lib/ee/gitlab/namespace_storage_size_error_message.rb'
-    - 'ee/lib/gitlab/checks/secrets_check.rb'
-    - 'ee/spec/support/shared_contexts/secrets_check_shared_contexts.rb'
-    - 'lib/backup/tasks/database.rb'
-    - 'lib/system_check/helpers.rb'

.rubocop_todo/gitlab/service_response.yml

@@ -31,7 +31,6 @@ Gitlab/ServiceResponse:
     - 'app/services/snippets/bulk_destroy_service.rb'
     - 'app/services/snippets/destroy_service.rb'
     - 'app/services/snippets/repository_validation_service.rb'
-    - 'app/services/snippets/update_statistics_service.rb'
     - 'app/services/timelogs/base_service.rb'
     - 'app/services/work_items/create_and_link_service.rb'
     - 'app/services/work_items/create_from_task_service.rb'

.rubocop_todo/layout/empty_lines_around_method_body.yml

@@ -10,9 +10,7 @@ Layout/EmptyLinesAroundMethodBody:
     - 'app/services/members/destroy_service.rb'
     - 'ee/app/models/software_license.rb'
     - 'ee/lib/gitlab/elastic/helper.rb'
-    - 'ee/lib/remote_development/workspace_operations/reconcile/output/desired_config_generator.rb'
     - 'ee/spec/support/helpers/identity_verification_helpers.rb'
-    - 'ee/spec/support/shared_contexts/remote_development/remote_development_shared_contexts.rb'
     - 'lib/api/helpers/packages_helpers.rb'
     - 'lib/gitlab/background_migration/batched_migration_job.rb'
     - 'lib/gitlab/ci/project_config.rb'

.rubocop_todo/layout/line_end_string_concatenation_indentation.yml

@@ -50,7 +50,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'ee/app/controllers/concerns/insights_actions.rb'
     - 'ee/app/controllers/ee/ldap/omniauth_callbacks_controller.rb'
     - 'ee/app/finders/geo/framework_registry_finder.rb'
-    - 'ee/app/graphql/ee/mutations/ci/project_ci_cd_settings_update.rb'
     - 'ee/app/graphql/ee/mutations/issues/create.rb'
     - 'ee/app/graphql/ee/mutations/merge_requests/update.rb'
     - 'ee/app/graphql/ee/resolvers/ci/all_jobs_resolver.rb'

.rubocop_todo/layout/line_length.yml

@@ -482,7 +482,6 @@ Layout/LineLength:
     - 'ee/app/graphql/resolvers/app_sec/dast/profile_resolver.rb'
     - 'ee/app/graphql/resolvers/board_groupings/epics_resolver.rb'
     - 'ee/app/graphql/resolvers/boards/epic_lists_resolver.rb'
-    - 'ee/app/graphql/resolvers/dora_metrics_resolver.rb'
     - 'ee/app/graphql/resolvers/external_issue_resolver.rb'
     - 'ee/app/graphql/resolvers/incident_management/oncall_rotations_resolver.rb'
     - 'ee/app/graphql/resolvers/incident_management/oncall_schedule_resolver.rb'
@@ -503,7 +502,6 @@ Layout/LineLength:
     - 'ee/app/graphql/types/dast_scan_type_enum.rb'
     - 'ee/app/graphql/types/dast_scanner_profile_type.rb'
     - 'ee/app/graphql/types/dast_site_profile_type.rb'
-    - 'ee/app/graphql/types/dora_metric_type_enum.rb'
     - 'ee/app/graphql/types/epic_health_status_type.rb'
     - 'ee/app/graphql/types/epic_sort_enum.rb'
     - 'ee/app/graphql/types/epic_type.rb'
@@ -542,7 +540,6 @@ Layout/LineLength:
     - 'ee/app/helpers/ee/mirror_helper.rb'
     - 'ee/app/helpers/ee/notes_helper.rb'
     - 'ee/app/helpers/ee/profiles_helper.rb'
-    - 'ee/app/helpers/ee/projects_helper.rb'
     - 'ee/app/helpers/ee/subscribable_banner_helper.rb'
     - 'ee/app/helpers/epics_helper.rb'
     - 'ee/app/helpers/gitlab_subscriptions/upcoming_reconciliation_helper.rb'
@@ -566,7 +563,6 @@ Layout/LineLength:
     - 'ee/app/models/concerns/approver_migrate_hook.rb'
     - 'ee/app/models/concerns/ee/issuable_link.rb'
     - 'ee/app/models/concerns/elastic/application_versioned_search.rb'
-    - 'ee/app/models/concerns/elastic/repositories_search.rb'
     - 'ee/app/models/concerns/geo/verification_state.rb'
     - 'ee/app/models/concerns/geo/verification_state_definition.rb'
     - 'ee/app/models/concerns/issue_widgets/acts_like_requirement.rb'
@@ -1112,7 +1108,6 @@ Layout/LineLength:
     - 'ee/spec/graphql/resolvers/boards/board_list_epics_resolver_spec.rb'
     - 'ee/spec/graphql/resolvers/ci/code_coverage_activities_resolver_spec.rb'
     - 'ee/spec/graphql/resolvers/dast_site_validation_resolver_spec.rb'
-    - 'ee/spec/graphql/resolvers/dora_metrics_resolver_spec.rb'
     - 'ee/spec/graphql/resolvers/epics_resolver_spec.rb'
     - 'ee/spec/graphql/resolvers/external_issue_resolver_spec.rb'
     - 'ee/spec/graphql/resolvers/incident_management/escalation_policies_resolver_spec.rb'
@@ -1167,7 +1162,6 @@ Layout/LineLength:
     - 'ee/spec/helpers/projects/on_demand_scans_helper_spec.rb'
     - 'ee/spec/helpers/projects/project_members_helper_spec.rb'
     - 'ee/spec/helpers/projects/security/dast_profiles_helper_spec.rb'
-    - 'ee/spec/helpers/projects_helper_spec.rb'
     - 'ee/spec/helpers/push_rules_helper_spec.rb'
     - 'ee/spec/helpers/subscriptions_helper_spec.rb'
     - 'ee/spec/helpers/timeboxes_helper_spec.rb'
@@ -1425,7 +1419,6 @@ Layout/LineLength:
     - 'ee/spec/models/namespace_setting_spec.rb'
     - 'ee/spec/models/packages/package_file_spec.rb'
     - 'ee/spec/models/project_import_data_spec.rb'
-    - 'ee/spec/models/project_import_state_spec.rb'
     - 'ee/spec/models/protected_environment_spec.rb'
     - 'ee/spec/models/protected_environments/approval_rule_spec.rb'
     - 'ee/spec/models/release_highlight_spec.rb'
@@ -1690,7 +1683,6 @@ Layout/LineLength:
     - 'ee/spec/services/ee/system_notes/issuables_service_spec.rb'
     - 'ee/spec/services/ee/users/destroy_service_spec.rb'
     - 'ee/spec/services/ee/users/update_service_spec.rb'
-    - 'ee/spec/services/elastic/process_initial_bookkeeping_service_spec.rb'
     - 'ee/spec/services/epics/issue_promote_service_spec.rb'
     - 'ee/spec/services/epics/update_service_spec.rb'
     - 'ee/spec/services/external_status_checks/update_service_spec.rb'
@@ -1966,7 +1958,6 @@ Layout/LineLength:
     - 'lib/api/project_snippets.rb'
     - 'lib/api/project_templates.rb'
     - 'lib/api/projects.rb'
-    - 'lib/api/projects_relation_builder.rb'
     - 'lib/api/pypi_packages.rb'
     - 'lib/api/releases.rb'
     - 'lib/api/repositories.rb'