.eslintrc.yml

@@ -95,7 +95,7 @@ rules:
         order: ignore
 overrides:
   - files:
-      - '**/spec/**/*'
+    - '{,ee/,jh/}spec/frontend*/**/*'
     rules:
       '@gitlab/require-i18n-strings': off
       '@gitlab/no-runtime-template-compiler': off
@@ -103,6 +103,8 @@ overrides:
         - error
         - selector: CallExpression[callee.object.name=/(wrapper|vm)/][callee.property.name="setData"]
           message: 'Avoid using "setData" on VTU wrapper'
+        - selector: MemberExpression[object.type!='ThisExpression'][property.type='Identifier'][property.name='$nextTick']
+          message: 'Using $nextTick from a component instance is discouraged. Import nextTick directly from the Vue package.'
   - files:
       - 'config/**/*'
       - 'scripts/**/*'

.gitlab/ci/memory.gitlab-ci.yml

@@ -11,36 +11,9 @@
       metrics: "${METRICS_FILE}"
     expire_in: 31d
 
-# Disabled since it causes intermittent SIGSEGV in CI:
-# https://gitlab.com/gitlab-org/gitlab/-/issues/350296
-.memory-static:
-  extends: .only-code-memory-job-base
-  stage: test
-  needs: ["setup-test-env"]
-  variables:
-    SETUP_DB: "false"
-    MEMORY_BUNDLE_MEM_FILE: "tmp/memory_bundle_mem.txt"
-    MEMORY_BUNDLE_OBJECTS_FILE: "tmp/memory_bundle_objects.txt"
-  script:
-    # Uses two different reports from the 'derailed_benchmars' gem.
-
-    # Loads each of gems in the Gemfile and checks how much memory they consume when they are required.
-    # 'derailed_benchmarks' internally uses 'get_process_mem'
-    - bundle exec derailed bundle:mem > "${MEMORY_BUNDLE_MEM_FILE}"
-    - scripts/generate-gems-size-metrics-static "${MEMORY_BUNDLE_MEM_FILE}" >> "${METRICS_FILE}"
-
-    # Outputs detailed information about objects created while gems are loaded.
-    # 'derailed_benchmarks' internally uses 'memory_profiler'
-    - bundle exec derailed bundle:objects > "${MEMORY_BUNDLE_OBJECTS_FILE}"
-    - scripts/generate-gems-memory-metrics-static "${MEMORY_BUNDLE_OBJECTS_FILE}" >> "${METRICS_FILE}"
-  artifacts:
-    paths:
-      - "${METRICS_FILE}"
-      - "${MEMORY_BUNDLE_MEM_FILE}"
-      - "${MEMORY_BUNDLE_OBJECTS_FILE}"
 
 # Show memory usage caused by invoking require per gem.
-# Unlike `memory-static`, it hits the app with one request to ensure that any last minute require-s have been called.
+# Hits the app with one request to ensure that any last minute require-s have been called.
 # The application is booted in `production` environment.
 # All tests are run without a webserver (directly using Rack::Mock by default).
 memory-on-boot:

.gitlab/issue_templates/Actionable Insight - Product change.md

@@ -29,4 +29,5 @@ This issue template is for an actionable insight that requires a change in the p
 
 /confidential
 /label ~"Actionable Insight::Product change"
+/label ~"SUS"
 

.gitlab/issue_templates/Deprecations.md

@@ -46,14 +46,18 @@ Which tier is this feature available in?
 
 <!-- In which milestone will this deprecation be announced ? -->
 
-### Planned Removal  Milestone
+### Planned Removal Milestone
 
 <!-- In which milestone will the feature or functionality be removed and announced? -->
 
 ### Links
 
 <!--
-Add links to any relevant documentation or code that will provide additional details or clarity regarding the planned change. Also, include a link to the removal issue if relevant.
+Add links to any relevant documentation or code that will provide additional details or clarity regarding the planned change.
+
+This issue is the main SSOT for the deprecations and removals process. Be sure to link all
+issues and MRs related to this deprecation/removal to this issue. This can include removal
+issues that were created ahead of time, and the MRs doing the actual deprecation/removal work.
 -->
 
 <!-- Label reminders - you should have one of each of the following labels.

.gitlab/issue_templates/Feature proposal - detailed.md

@@ -63,7 +63,12 @@ Consider adding checkboxes and expectations of users with certain levels of memb
 * [ ] Add expected impact to Reporter (20) members
 * [ ] Add expected impact to Developer (30) members
 * [ ] Add expected impact to Maintainer (40) members
-* [ ] Add expected impact to Owner (50) members -->
+* [ ] Add expected impact to Owner (50) members 
+
+Please consider performing a threat model for the code changes that are introduced as part of this feature. To get started, refer to our Threat Modeling handbook page https://about.gitlab.com/handbook/security/threat_modeling/#threat-modeling. 
+
+Don't hesitate to reach out to the Application Security Team (`@gitlab-com/gl-security/appsec`) to discuss any security concerns.
+-->
 
 ### Documentation
 

.gitlab/issue_templates/Problem Validation.md

-<!-- This template is used as a starting point for understing and articulating a customer problem.
+<!-- This template is used as a starting point for understanding and articulating a customer problem.
 Learn more about it in the handbook: https://about.gitlab.com/handbook/product-development-flow/#validation-phase-2-problem-validation 
 -->
 

.gitlab/issue_templates/Security developer workflow.md

@@ -9,9 +9,7 @@ Set the title to: `Description of the original issue`
 ## Prior to starting the security release work
 
 - [ ] Read the [security process for developers] if you are not familiar with it.
-- [ ] Make sure the issue really needs to follow the security release workflow.
-  - Verify if the issue you're working on `gitlab-org/gitlab` is confidential, if it's public fix should be placed on GitLab canonical and no backports are required.
-  - If the issue you're fixing doesn't appear to be something that can be exploited by a malicious person and is instead simply a security enhancement do not hesitate to ping `@gitlab-com/gl-security/appsec` to discuss if the issue can be fixed in the canonical repository.
+- [ ] Make sure the [issue really needs to follow the security release workflow].
 - [ ] **IMPORTANT**: Mark this [issue as linked] to the Security Release Tracking Issue. You can find it [here](https://gitlab.com/gitlab-org/gitlab/-/issues?sort=created_date&state=opened&label_name[]=upcoming+security+release). This issue
 MUST be linked for the release bot to know that the associated merge requests should be merged for this security release.
 - Fill out the [Links section](#links):
@@ -71,5 +69,6 @@ After your merge request has been approved according to our [approval guidelines
 [security Release merge request template]: https://gitlab.com/gitlab-org/security/gitlab/blob/master/.gitlab/merge_request_templates/Security%20Release.md
 [approval guidelines]: https://docs.gitlab.com/ee/development/code_review.html#approval-guidelines
 [issue as linked]: https://docs.gitlab.com/ee/user/project/issues/related_issues.html#add-a-linked-issue
+[issue really needs to follow the security release workflow]: https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/developer.md#making-sure-the-issue-needs-to-follow-the-security-release-workflow
 
 /label ~security

.gitlab/merge_request_templates/Deprecations.md

@@ -7,9 +7,8 @@
 **Be sure to link this MR to the relevant deprecation issue(s).**
 
 - Deprecation Issue:
-- MR that deprecates the feature (optional):
 
-If there is no relevant removal or deprecation issue, hit pause and:
+If there is no relevant deprecation issue, hit pause and:
 
 - Review the [process for deprecating and removing features](https://about.gitlab.com/handbook/product/gitlab-the-product/#process-for-deprecating-and-removing-a-feature).
 - Connect with the Product Manager DRI.

.markdownlint.yml

@@ -139,6 +139,8 @@ proper-names:
     "unicorn-worker-killer",
     "URL",
     "WebdriverIO",
+    "Workload Identity Pool",
+    "Workload Identity Provider",
     "YAML",
     "YouTrack"
   ]

.projections.json.example

@@ -31,6 +31,14 @@
     "alternate": "lib/api/{}.rb",
     "type": "test"
   },
+  "rubocop/cop/*.rb": {
+    "alternate": "spec/rubocop/cop/{}_spec.rb",
+    "type": "source"
+  },
+  "spec/rubocop/cop/*_spec.rb": {
+    "alternate": "rubocop/cop/{}.rb",
+    "type": "test"
+  },
   "ee/lib/api/*.rb": {
     "alternate": "ee/spec/requests/api/{}_spec.rb",
     "type": "source"

.rubocop.yml

@@ -97,14 +97,8 @@ RSpec/FilePath:
 
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 28
+  Max: 25
   AllowSubject: true
-  Exclude:
-    - 'spec/migrations/**/*.rb'
-    - 'spec/lib/gitlab/background_migration/populate_project_snippet_statistics_spec.rb'
-    - 'spec/lib/gitlab/background_migration/populate_finding_uuid_for_vulnerability_feedback_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/populate_uuids_for_security_findings_spec.rb'
-    - 'ee/spec/lib/gitlab/background_migration/user_mentions/create_resource_user_mention_spec.rb'
 
 Naming/FileName:
   ExpectMatchingDefinition: true
@@ -174,6 +168,7 @@ Naming/FileName:
     - GitLab
     - JavaScript
     - VSCode
+    - JetBrains
     # default ones:
     - CLI
     - DSL
@@ -517,24 +512,6 @@ Graphql/Descriptions:
 RSpec/ImplicitSubject:
   Enabled: false
 
-# WIP See https://gitlab.com/gitlab-org/gitlab/-/issues/211580
-RSpec/LeakyConstantDeclaration:
-  Enabled: true
-  Exclude:
-    - 'spec/db/schema_spec.rb'
-    - 'spec/lib/feature_spec.rb'
-    - 'spec/lib/gitlab/config/entry/simplifiable_spec.rb'
-    - 'spec/lib/gitlab/quick_actions/dsl_spec.rb'
-    - 'spec/lib/marginalia_spec.rb'
-    - 'spec/mailers/notify_spec.rb'
-    - 'spec/models/concerns/batch_destroy_dependent_associations_spec.rb'
-    - 'spec/models/concerns/bulk_insert_safe_spec.rb'
-    - 'spec/models/concerns/bulk_insertable_associations_spec.rb'
-    - 'spec/models/concerns/triggerable_hooks_spec.rb'
-    - 'spec/models/repository_spec.rb'
-    - 'spec/services/clusters/applications/check_installation_progress_service_spec.rb'
-    - 'spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb'
-
 RSpec/EmptyLineAfterHook:
   Enabled: false
 

.rubocop_todo/database/multiple_databases.yml

@@ -19,7 +19,6 @@ Database/MultipleDatabases:
   - lib/gitlab/database/migrations/observers/query_log.rb
   - lib/gitlab/database/partitioning_migration_helpers/backfill_partitioned_table.rb
   - lib/gitlab/database.rb
-  - lib/gitlab/database/with_lock_retries.rb
   - lib/gitlab/gitlab_import/importer.rb
   - lib/gitlab/health_checks/db_check.rb
   - lib/gitlab/import_export/base/relation_factory.rb

.rubocop_todo/gitlab/namespaced_class.yml

@@ -428,6 +428,7 @@ Gitlab/NamespacedClass:
   - app/policies/user_policy.rb
   - app/policies/wiki_page_policy.rb
   - app/policies/wiki_policy.rb
+  - app/policies/work_item_policy.rb
   - app/presenters/award_emoji_presenter.rb
   - app/presenters/blob_presenter.rb
   - app/presenters/board_presenter.rb

.rubocop_todo/rails/save_bang.yml

@@ -2,35 +2,3 @@
 Rails/SaveBang:
   Exclude:
   - ee/spec/lib/analytics/merge_request_metrics_calculator_spec.rb
-  - spec/lib/backup/manager_spec.rb
-  - spec/lib/gitlab/alerting/alert_spec.rb
-  - spec/lib/gitlab/analytics/cycle_analytics/records_fetcher_spec.rb
-  - spec/lib/gitlab/auth/ldap/user_spec.rb
-  - spec/lib/gitlab/auth/o_auth/user_spec.rb
-  - spec/lib/gitlab/auth/saml/user_spec.rb
-  - spec/lib/gitlab/auth_spec.rb
-  - spec/lib/gitlab/authorized_keys_spec.rb
-  - spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
-  - spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb
-  - spec/lib/gitlab/database/custom_structure_spec.rb
-  - spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb
-  - spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb
-  - spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb
-  - spec/lib/gitlab/import_export/fork_spec.rb
-  - spec/lib/gitlab/import_export/group/legacy_tree_saver_spec.rb
-  - spec/lib/gitlab/import_export/group/relation_factory_spec.rb
-  - spec/lib/gitlab/import_export/group/tree_saver_spec.rb
-  - spec/lib/gitlab/import_export/importer_spec.rb
-  - spec/lib/gitlab/import_export/lfs_restorer_spec.rb
-  - spec/lib/gitlab/import_export/lfs_saver_spec.rb
-  - spec/lib/gitlab/import_export/members_mapper_spec.rb
-  - spec/lib/gitlab/import_export/project/relation_factory_spec.rb
-  - spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
-  - spec/lib/gitlab/import_export/project/tree_saver_spec.rb
-  - spec/lib/gitlab/import_export/repo_restorer_spec.rb
-  - spec/lib/gitlab/import_export/saver_spec.rb
-  - spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb
-  - spec/lib/gitlab/import_export/snippet_repo_saver_spec.rb
-  - spec/lib/gitlab/import_export/snippets_repo_restorer_spec.rb
-  - spec/lib/gitlab/import_export/snippets_repo_saver_spec.rb
-  - spec/lib/gitlab/import_export/uploads_manager_spec.rb

.rubocop_todo/rspec/any_instance_of.yml

@@ -29,7 +29,6 @@ RSpec/AnyInstanceOf:
   - ee/spec/features/security/project/internal_access_spec.rb
   - ee/spec/features/security/project/private_access_spec.rb
   - ee/spec/features/security/project/public_access_spec.rb
-  - ee/spec/features/trials/capture_lead_spec.rb
   - ee/spec/features/trials/select_namespace_spec.rb
   - ee/spec/features/users/login_spec.rb
   - ee/spec/graphql/mutations/dast_on_demand_scans/create_spec.rb

.rubocop_todo/rspec/leaky_constant_declaration.yml

+---
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+  - spec/db/schema_spec.rb
+  - spec/lib/gitlab/config/entry/simplifiable_spec.rb
+  - spec/lib/gitlab/quick_actions/dsl_spec.rb
+  - spec/lib/marginalia_spec.rb
+  - spec/mailers/notify_spec.rb
+  - spec/models/concerns/batch_destroy_dependent_associations_spec.rb
+  - spec/models/concerns/bulk_insert_safe_spec.rb
+  - spec/models/concerns/bulk_insertable_associations_spec.rb
+  - spec/models/concerns/triggerable_hooks_spec.rb
+  - spec/models/repository_spec.rb
+  - spec/services/clusters/applications/check_installation_progress_service_spec.rb
+  - spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb

.rubocop_todo/rspec/multiple_memoized_helpers.yml

+---
+RSpec/MultipleMemoizedHelpers:
+  Exclude:
+  - spec/lib/gitlab/background_migration/populate_finding_uuid_for_vulnerability_feedback_spec.rb
+  - spec/lib/gitlab/background_migration/recalculate_vulnerabilities_occurrences_uuid_spec.rb
+  - spec/lib/gitlab/diff/position_tracer/line_strategy_spec.rb
+  - spec/requests/api/ci/runner/jobs_artifacts_spec.rb
+  - ee/spec/lib/ee/gitlab/background_migration/populate_latest_pipeline_ids_spec.rb
+  - ee/spec/lib/ee/gitlab/background_migration/populate_uuids_for_security_findings_spec.rb
+  - ee/spec/services/ee/boards/issues/move_service_spec.rb
+  - ee/spec/services/security/store_report_service_spec.rb

.rubocop_todo/style/open_struct_use.yml

@@ -17,7 +17,6 @@ Style/OpenStructUse:
   - spec/factories/go_module_versions.rb
   - spec/factories/wiki_pages.rb
   - spec/features/projects/clusters_spec.rb
-  - spec/finders/template_finder_spec.rb
   - spec/graphql/mutations/branches/create_spec.rb
   - spec/graphql/mutations/clusters/agent_tokens/create_spec.rb
   - spec/graphql/mutations/clusters/agents/create_spec.rb
@@ -30,9 +29,6 @@ Style/OpenStructUse:
   - spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb
   - spec/lib/gitlab/legacy_github_import/project_creator_spec.rb
   - spec/lib/gitlab/quick_actions/command_definition_spec.rb
-  - spec/models/design_management/design_action_spec.rb
-  - spec/models/design_management/design_at_version_spec.rb
-  - spec/services/packages/nuget/metadata_extraction_service_spec.rb
   - spec/services/projects/import_service_spec.rb
   - spec/services/system_note_service_spec.rb
   - spec/support/helpers/import_spec_helper.rb

GITALY_SERVER_VERSION

-7a8fd30510a92d436a5144c3c20f6654ff3ec51d
+6a0d504d7a63a7bdf3a71d06917615c8fc301c8a

GITLAB_PAGES_VERSION

-1.51.0
+1.53.0