.gitlab-ci.yml

@@ -218,7 +218,6 @@ variables:
   BUNDLER_CHECKSUM_VERIFICATION_OPT_IN: "1"
   CACHE_CLASSES: "true"
   CHECK_PRECOMPILED_ASSETS: "true"
-  FF_USE_FASTZIP: "true"
   RETRY_FAILED_TESTS_IN_NEW_PROCESS: "true"
   # Run with decomposed databases by default
   DECOMPOSED_DB: "true"
@@ -231,11 +230,6 @@ variables:
   REVIEW_APPS_GCP_PROJECT: "gitlab-review-apps"
   REVIEW_APPS_GCP_REGION: "us-central1"
 
-  CACHE_ASSETS_AS_PACKAGE: "true"
-  REUSE_FRONTEND_FIXTURES_ENABLED: "true"
-  BUILD_ASSETS_IMAGE: "true"  # Set it to "false" to disable assets image building, used in `build-assets-image`
-  SIMPLECOV: "true"
-
   REGISTRY_HOST: "registry.gitlab.com"
   REGISTRY_GROUP: "gitlab-org"
 
@@ -250,6 +244,15 @@ variables:
   # https://github.com/ruby/ruby/pull/7663 lands in the Ruby interpreter.
   NOKOGIRI_LIBXML_MEMORY_MANAGEMENT: default
 
+  # CI jobs behavior can be changed by changing the value of these variables in the project's CI/CD variables
+  AVERAGE_KNAPSACK_REPORT: "true"
+  ENABLE_DEPSASTER: "true"
+  ENABLE_DEPSCORE: "true"
+  CACHE_ASSETS_AS_PACKAGE: "true"
+  REUSE_FRONTEND_FIXTURES_ENABLED: "true"
+  BUILD_ASSETS_IMAGE: "true"  # Set it to "false" to disable assets image building, used in `build-assets-image`
+  SIMPLECOV: "true"
+
 include:
   - local: .gitlab/ci/_skip.yml
     rules:

.gitlab/CODEOWNERS

@@ -1495,6 +1495,10 @@ ee/lib/ee/api/entities/project.rb
 ^[DiffMatchPatch gem]
 /vendor/gems/diff_match_patch @garyh
 
+^[Gitlab Housekeeper gem] @DylanGriffith @rymai @tigerwnz
+/gems/gitlab-housekeeper/
+/keeps/
+
 # JiHu GitLab rules. See https://gitlab.com/gitlab-jh/gitlab-jh-enablement/-/issues/213#note_1024367528
 
 [JH Frontend] @jihulab/maintainers/frontend

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

@@ -286,7 +286,7 @@
 
 .zoekt-services:
   services:
-    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.5
+    - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.6
       alias: zoekt-ci-image
 
 .use-pg13:

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

@@ -567,7 +567,7 @@ importers:
     - if: $QA_SUITES =~ /Test::Integration::Import/
     - !reference [.rules:test:manual, rules]
 
-ai-gateway-sync-seat-link:
+ai-gateway:
   extends:
     - .qa
     - .failure-videos
@@ -578,11 +578,6 @@ ai-gateway-sync-seat-link:
     - if: $QA_SUITES =~ /Test::Integration::AiGateway/
     - !reference [.rules:test:manual, rules]
 
-ai-gateway-sync-service-token:
-  extends: ai-gateway-sync-seat-link
-  variables:
-    QA_USE_SYNC_SERVICE_TOKEN_WORKER: "true"
-
 # ------------------------------------------
 # Update jobs
 # ------------------------------------------

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

@@ -120,8 +120,7 @@ include:
           --token "${KNAPSACK_REPORT_ISSUES_PROJECT_TOKEN}" \
           --project "gitlab-org/gitlab" \
           --input-file knapsack/rspec_*_report.json \
-          --expected-report node_specs_expected_duration.json \
-          --merge_request_iid "$CI_MERGE_REQUEST_IID";
+          --expected-report node_specs_expected_duration.json;
       fi
     - echo -e "\e[0Ksection_end:`date +%s`:report_results_section\r\e[0K"
     - tooling/bin/push_job_metrics || true

.gitlab/ci/reports.gitlab-ci.yml

@@ -143,15 +143,23 @@ pajamas_adoption:
   extends:
     - .default-retry
     - .reports:rules:pajamas_adoption
-  allow_failure: true
+  allow_failure:
+    # The scanner exits with status:
+    # - 0 when no errors occur, and no blocking findings are found;
+    # - 1 when unexpected errors occur;
+    # - 2 when blocking findings are found.
+    # We only want to block the merge request in this last case.
+    exit_codes: 1
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/frontend/pajamas-adoption-scanner:latest
   stage: lint
   needs: []
+  variables:
+    FF_USE_NEW_BASH_EVAL_STRATEGY: 'true'
   script:
-    - EE_APP=$(test -d ee/app/ && echo 'ee/app/' || true)
-    - scan_gitlab_code_quality app/ $EE_APP
+    - scan_gitlab_code_quality {,ee/}app/
   artifacts:
     name: pajamas-adoption
+    when: always
     paths:
       - gl-code-quality-report.json
       - pas-findings.json

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

@@ -2534,7 +2534,7 @@
 
 .static-analysis:rules:trigger-depsaster:
   rules:
-    - if: $ENABLE_DEPSASTER != 'true'
+    - if: "$ENABLE_DEPSASTER != 'true'"
       when: never
     - <<: *if-fork-merge-request
       when: never
@@ -2565,10 +2565,12 @@
   rules:
     # Requiring $DEPENDENCY_REVIEW_PAT prevents the bot from running on forks or CE
     # Without it the script would fail too.
-    - if: $ENABLE_DEPSCORE != 'true'
+    - if: "$ENABLE_DEPSCORE != 'true'"
       when: never
     - if: "$DEPENDENCY_REVIEW_PAT == null"
       when: never
+    - <<: *if-fork-merge-request
+      when: never
     - <<: *if-not-ee
       when: never
     # Run only when the merge request have dependency file modifications
@@ -2725,7 +2727,8 @@
     - <<: *if-merge-request
       changes:
         - '{,ee/}app/**/*.{js,vue,rb,haml}'
-    - <<: *if-default-refs
+    - <<: *if-default-branch-refs
+      allow_failure: true
 
 ################
 # Review rules #

.rubocop.yml

@@ -1132,3 +1132,11 @@ Gitlab/LicenseAvailableUsage:
     - 'app/models/application_setting.rb'
     - 'ee/app/models/ee/application_setting.rb'
     - 'lib/gitlab/current_settings.rb'
+
+Gitlab/TokenWithoutPrefix:
+  Enabled: true
+  Include:
+    - 'app/**/*'
+    - 'lib/**/*'
+    - 'ee/app/**/*'
+    - 'ee/lib/**/*'
\ No newline at end of file

.rubocop_todo/gitlab/namespaced_class.yml

@@ -1215,7 +1215,6 @@ Gitlab/NamespacedClass:
     - 'lib/gitlab/untrusted_regexp.rb'
     - 'lib/gitlab/untrusted_regexp/ruby_syntax.rb'
     - 'lib/gitlab/uploads_transfer.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab/url_builder.rb'
     - 'lib/gitlab/url_helpers.rb'
     - 'lib/gitlab/url_sanitizer.rb'

.rubocop_todo/gitlab/token_without_prefix.yml

+---
+Gitlab/TokenWithoutPrefix:
+  Details: grace period
+  Exclude:
+    - 'app/models/application_setting.rb'

.rubocop_todo/layout/empty_line_after_magic_comment.yml

@@ -126,7 +126,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'config/routes/merge_requests.rb'
     - 'danger/ce_ee_vue_templates/Dangerfile'
     - 'danger/feature_flag/Dangerfile'
-    - 'danger/pajamas/Dangerfile'
     - 'ee/app/controllers/concerns/epics_actions.rb'
     - 'ee/app/controllers/concerns/saml_authorization.rb'
     - 'ee/app/controllers/ee/projects/analytics/cycle_analytics/stages_controller.rb'
@@ -368,7 +367,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'lib/gitlab/auth/otp/fortinet.rb'
     - 'lib/gitlab/background_migration/backfill_imported_issue_search_data.rb'
     - 'lib/gitlab/background_migration/backfill_issue_search_data.rb'
-    - 'lib/gitlab/background_migration/backfill_project_import_level.rb'
     - 'lib/gitlab/background_migration/backfill_project_namespace_details.rb'
     - 'lib/gitlab/background_migration/mailers/unconfirm_mailer.rb'
     - 'lib/gitlab/ci/secure_files/mobile_provision.rb'

.rubocop_todo/layout/line_length.yml

@@ -668,7 +668,6 @@ Layout/LineLength:
     - 'danger/ci_config/Dangerfile'
     - 'danger/documentation/Dangerfile'
     - 'danger/feature_flag/Dangerfile'
-    - 'danger/pajamas/Dangerfile'
     - 'danger/roulette/Dangerfile'
     - 'danger/vue_shared_documentation/Dangerfile'
     - 'ee/app/controllers/admin/elasticsearch_controller.rb'
@@ -2671,7 +2670,6 @@ Layout/LineLength:
     - 'lib/gitlab/tracking.rb'
     - 'lib/gitlab/tracking/destinations/snowplow.rb'
     - 'lib/gitlab/tracking/event_definition.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab/usage/metric_definition.rb'
     - 'lib/gitlab/usage/metrics/aggregates/aggregate.rb'
     - 'lib/gitlab/usage/metrics/aggregates/sources/calculations/intersection.rb'
@@ -3801,7 +3799,6 @@ Layout/LineLength:
     - 'spec/lib/gitlab/tracking/event_definition_spec.rb'
     - 'spec/lib/gitlab/tracking/standard_context_spec.rb'
     - 'spec/lib/gitlab/tracking_spec.rb'
-    - 'spec/lib/gitlab/url_blocker_spec.rb'
     - 'spec/lib/gitlab/url_builder_spec.rb'
     - 'spec/lib/gitlab/usage/metric_definition_spec.rb'
     - 'spec/lib/gitlab/usage/metric_spec.rb'
@@ -4024,7 +4021,6 @@ Layout/LineLength:
     - 'spec/models/todo_spec.rb'
     - 'spec/models/upload_spec.rb'
     - 'spec/models/uploads/fog_spec.rb'
-    - 'spec/models/user_detail_spec.rb'
     - 'spec/models/user_spec.rb'
     - 'spec/models/wiki_page_spec.rb'
     - 'spec/models/x509_certificate_spec.rb'

.rubocop_todo/layout/space_in_lambda_literal.yml

@@ -277,7 +277,6 @@ Layout/SpaceInLambdaLiteral:
     - 'ee/lib/ee/api/entities/list.rb'
     - 'ee/lib/ee/api/entities/member.rb'
     - 'ee/lib/ee/api/entities/project_approval_rule.rb'
-    - 'ee/lib/ee/api/entities/user_basic.rb'
     - 'ee/lib/ee/api/entities/vulnerability_issue_link.rb'
     - 'ee/lib/ee/gitlab/background_migration/backfill_epic_cache_counts.rb'
     - 'ee/lib/ee/gitlab/background_migration/delete_approval_rules_with_vulnerability.rb'

.rubocop_todo/lint/missing_cop_enable_directive.yml

@@ -59,7 +59,6 @@ Lint/MissingCopEnableDirective:
     - 'app/services/projects/container_repository/third_party/delete_tags_service.rb'
     - 'app/services/search/global_service.rb'
     - 'danger/feature_flag/Dangerfile'
-    - 'danger/pajamas/Dangerfile'
     - 'ee/app/controllers/ee/admin/dashboard_controller.rb'
     - 'ee/app/controllers/ee/admin/groups_controller.rb'
     - 'ee/app/controllers/ee/admin/users_controller.rb'

.rubocop_todo/performance/map_compact.yml

@@ -103,7 +103,6 @@ Performance/MapCompact:
     - 'lib/gitlab/git/commit.rb'
     - 'lib/gitlab/git/conflict/file.rb'
     - 'lib/gitlab/sql/pattern.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'qa/qa/page/component/issuable/sidebar.rb'
     - 'qa/qa/support/formatters/test_metrics_formatter.rb'
     - 'qa/qa/tools/ci/ff_changes.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -2749,7 +2749,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/background_migration/backfill_namespace_id_of_vulnerability_reads_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_note_discussion_id_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_project_feature_package_registry_access_level_spec.rb'
-    - 'spec/lib/gitlab/background_migration/backfill_project_import_level_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_project_namespace_details_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_project_repositories_spec.rb'
     - 'spec/lib/gitlab/background_migration/backfill_topics_title_spec.rb'
@@ -4639,7 +4638,6 @@ RSpec/FeatureCategory:
     - 'spec/models/prometheus_alert_spec.rb'
     - 'spec/models/prometheus_metric_spec.rb'
     - 'spec/models/protectable_dropdown_spec.rb'
-    - 'spec/models/protected_tag_spec.rb'
     - 'spec/models/push_event_payload_spec.rb'
     - 'spec/models/push_event_spec.rb'
     - 'spec/models/raw_usage_data_spec.rb'
@@ -4680,7 +4678,6 @@ RSpec/FeatureCategory:
     - 'spec/models/user_agent_detail_spec.rb'
     - 'spec/models/user_canonical_email_spec.rb'
     - 'spec/models/user_custom_attribute_spec.rb'
-    - 'spec/models/user_detail_spec.rb'
     - 'spec/models/user_highest_role_spec.rb'
     - 'spec/models/user_mentions/commit_user_mention_spec.rb'
     - 'spec/models/user_mentions/issue_user_mention_spec.rb'

.rubocop_todo/rspec/named_subject.yml

@@ -2416,7 +2416,6 @@ RSpec/NamedSubject:
     - 'spec/lib/gitlab/tree_summary_spec.rb'
     - 'spec/lib/gitlab/unicode_spec.rb'
     - 'spec/lib/gitlab/untrusted_regexp_spec.rb'
-    - 'spec/lib/gitlab/url_blocker_spec.rb'
     - 'spec/lib/gitlab/url_builder_spec.rb'
     - 'spec/lib/gitlab/usage/metric_definition_spec.rb'
     - 'spec/lib/gitlab/usage/metrics/instrumentations/database_metric_spec.rb'

.rubocop_todo/style/arguments_forwarding.yml

@@ -115,7 +115,6 @@ Style/ArgumentsForwarding:
     - 'lib/gitlab/redis/multi_store.rb'
     - 'lib/gitlab/repository_cache.rb'
     - 'lib/gitlab/tracking.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab/url_builder.rb'
     - 'lib/gitlab/usage/metrics/query.rb'
     - 'lib/gitlab_settings/settings.rb'

.rubocop_todo/style/guard_clause.yml

@@ -538,7 +538,6 @@ Style/GuardClause:
     - 'lib/gitlab/sidekiq_config/cli_methods.rb'
     - 'lib/gitlab/sidekiq_middleware/size_limiter/compressor.rb'
     - 'lib/gitlab/sql/set_operator.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab/usage/metrics/instrumentations/count_bulk_imports_entities_metric.rb'
     - 'lib/gitlab/utils/override.rb'
     - 'lib/gitlab/webpack/manifest.rb'

.rubocop_todo/style/if_unless_modifier.yml

@@ -881,7 +881,6 @@ Style/IfUnlessModifier:
     - 'lib/gitlab/suggestions/suggestion_set.rb'
     - 'lib/gitlab/template_parser/eval_state.rb'
     - 'lib/gitlab/untrusted_regexp.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab/usage_data_counters/base_counter.rb'
     - 'lib/gitlab/usage_data_counters/hll_redis_counter.rb'
     - 'lib/gitlab/utils/delegator_override.rb'