.gitlab/ci/aigw-tagging.gitlab-ci.yml

@@ -4,10 +4,8 @@ trigger-ai-gateway-tagging:
   script:
     - |
       curl -X POST --fail \
-        -F "token=${AIGW_PIPELINE_TRIGGER_TOKEN}" \
-        -F "ref=main" \
-        -F "variables[GITLAB_VERSION]=${CI_COMMIT_TAG}" \
-        "https://gitlab.com/api/v4/projects/39903947/trigger/pipeline"
+        --header "PRIVATE-TOKEN: $AIGW_TAGGING_ACCESS_TOKEN" \
+        "https://gitlab.com/api/v4/projects/39903947/repository/tags?tag_name=self-hosted-${CI_COMMIT_TAG}&ref=main"
   extends:
     - .ai-gateway:rules:tagging
   allow_failure: true

.gitlab/ci/database.gitlab-ci.yml

 include:
   - local: .gitlab/ci/rails/shared.gitlab-ci.yml
 
+db:setup pg14:
+  stage: prepare
+  needs: []
+  extends:
+    - .use-pg14
+    - .default-before_script
+    - .ruby-cache
+    - .rails:rules:setup-test-env
+  script:
+    - source scripts/utils.sh
+    - run_timed_command "pg_dumpall -h postgres -U postgres > pg_dumpall.sql"
+  artifacts:
+    paths:
+      - pg_dumpall.sql
+
 db:rollback single-db-ci-connection:
   extends:
     - db:rollback

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

@@ -36,7 +36,6 @@
     # This is needed by `trigger-omnibus-env` (`.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml`).
     PARENT_PIPELINE_ID: $CI_PIPELINE_ID
     PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE
-    SKIP_MESSAGE: Skipping test-on-omnibus due to mr containing only quarantine changes!
     GITLAB_QA_IMAGE: "${CI_REGISTRY_IMAGE}/gitlab-ee-qa:${CI_COMMIT_SHA}"  # This is used for the CI job image from https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/8.4.4/ci/base.gitlab-ci.yml
     QA_IMAGE: "${CI_REGISTRY_IMAGE}/gitlab-ee-qa:${CI_COMMIT_SHA}"  # This is used for the gitlab-qa image pulled from the E2E tests. If this is not defined, it'll be inferred from RELEASE_IMAGE_TAG below which is wrong because it should not contain the RUBY_VERSION suffix
     RELEASE_IMAGE_TAG: "${CI_COMMIT_SHA}-ruby${RUBY_VERSION}"  # This contains a RUBY_VERSION suffix because Omnibus build is depending on the RUBY_VERSION
@@ -199,7 +198,6 @@ e2e:test-on-gdk:
     QA_RUN_TYPE: e2e-test-on-gdk
     PIPELINE_NAME: E2E GDK
     DYNAMIC_PIPELINE_YML: ${CI_PROJECT_DIR}/qa/tmp/test-on-gdk-pipeline.yml
-    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:
@@ -231,7 +229,6 @@ e2e:test-on-cng:
     QA_RUN_TYPE: e2e-test-on-cng
     PIPELINE_NAME: E2E CNG
     DYNAMIC_PIPELINE_YML: ${CI_PROJECT_DIR}/qa/tmp/test-on-cng-pipeline.yml
-    SKIP_MESSAGE: Skipping test-on-cng due to mr containing only quarantine changes!
 
 e2e:code-suggestions-eval:
   extends:

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

@@ -210,6 +210,10 @@ include:
     - !reference [.rspec-base, after_script]
 
 .rspec-base-pg14:
+  needs:
+    - !reference [.rspec-base, needs]
+    - job: "db:setup pg14"
+      optional: true
   extends:
     - .rspec-base
     - .use-pg14

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

@@ -179,17 +179,6 @@ gitlab-pages:
   variables:
     QA_SCENARIO: Test::Integration::GitlabPages
 
-# ========== git sha256 enabled ===========
-git-sha256-repositories:
-  extends:
-    - .parallel
-    - .qa
-    - .with-ignored-runtime-data
-  variables:
-    QA_SCENARIO: Test::Instance::Image
-    QA_USE_SHA256_REPOSITORY_OBJECT_STORAGE: true
-    GITLAB_QA_OPTS: "--enable-feature support_sha256_repositories"
-
 # ========== Update From Previous with AI components ===========
 update-minor-ee-ai-components:
   extends:

.gitlab/merge_request_templates/Documentation SA Solutions Docs.md

@@ -16,6 +16,8 @@ This MR Template ensures that Solutions Docs published here: https://docs.gitlab
 - [ ] 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`
 
 ## Merging
 

.rubocop.yml

@@ -1251,3 +1251,7 @@ Tailwind/StringInterpolation:
   - '{,ee/,jh/}app/helpers/**/*.rb'
   - '{,ee/,jh/}app/components/**/*.{haml,rb}'
   - '{,ee/,jh/}app/views/**/*.haml'
+
+Cop/ActiveRecordDependent:
+  Include:
+    - ee/app/models/**/*.rb

.rubocop_todo/layout/empty_line_after_magic_comment.yml

@@ -250,7 +250,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'ee/spec/lib/gitlab/middleware/ip_restrictor_spec.rb'
     - 'ee/spec/lib/gitlab/search/client_spec.rb'
     - 'ee/spec/lib/gitlab/spdx/catalogue_spec.rb'
-    - 'ee/spec/lib/system_check/app/advanced_search_migrations_check_spec.rb'
     - 'ee/spec/lib/system_check/geo/http_connection_check_spec.rb'
     - 'ee/spec/models/analytics/cycle_analytics/aggregation_context_spec.rb'
     - 'ee/spec/models/ci/minutes/quota_spec.rb'

.rubocop_todo/layout/line_end_string_concatenation_indentation.yml

@@ -126,7 +126,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'ee/app/helpers/push_rules_helper.rb'
     - 'ee/app/helpers/users/identity_verification_helper.rb'
     - 'ee/app/mailers/ci_minutes_usage_mailer.rb'
-    - 'ee/app/models/ci/minutes/notification.rb'
     - 'ee/app/models/concerns/audit_events/gcp_externally_destinationable.rb'
     - 'ee/app/models/ee/member.rb'
     - 'ee/app/models/ee/merge_request.rb'

.rubocop_todo/migration/batched_migration_base_class.yml

@@ -5,7 +5,6 @@ Migration/BatchedMigrationBaseClass:
     - 'lib/gitlab/background_migration/backfill_issue_search_data.rb'
     - 'lib/gitlab/background_migration/backfill_iteration_cadence_id_for_boards.rb'
     - 'lib/gitlab/background_migration/backfill_member_namespace_for_group_members.rb'
-    - 'lib/gitlab/background_migration/backfill_namespace_id_for_project_route.rb'
     - 'lib/gitlab/background_migration/backfill_note_discussion_id.rb'
     - 'lib/gitlab/background_migration/backfill_project_repositories.rb'
     - 'lib/gitlab/background_migration/backfill_project_settings.rb'

.rubocop_todo/rspec/be_empty.yml

----
-# Cop supports --autocorrect.
-RSpec/BeEmpty:
-  Exclude:
-    - 'ee/spec/models/concerns/elastic/application_versioned_search_spec.rb'
-    - 'ee/spec/models/ee/group_spec.rb'
-    - 'ee/spec/models/ee/user_spec.rb'
-    - 'ee/spec/models/product_analytics/visualization_spec.rb'
-    - 'ee/spec/requests/api/graphql/ai/feature_settings/feature_settings_spec.rb'
-    - 'ee/spec/services/releases/update_service_spec.rb'
-    - 'ee/spec/support/shared_examples/lib/sidebars/menus_shared_examples.rb'
-    - 'ee/spec/support/shared_examples/models/authz/member_roles_shared_examples.rb'
-    - 'ee/spec/support/shared_examples/quick_actions/merge_request/unassign_reviewer_shared_examples.rb'
-    - 'spec/helpers/nav/new_dropdown_helper_spec.rb'
-    - 'spec/helpers/users_helper_spec.rb'
-    - 'spec/lib/click_house/iterator_spec.rb'
-    - 'spec/lib/gitlab/checks/changes_access_spec.rb'
-    - 'spec/lib/gitlab/ci/jwt_spec.rb'
-    - 'spec/lib/gitlab/ci/variables/builder/release_spec.rb'
-    - 'spec/lib/gitlab/mail_room/mail_room_spec.rb'
-    - 'spec/lib/gitlab/search_results_spec.rb'
-    - 'spec/lib/search/empty_search_results_spec.rb'

.rubocop_todo/rspec/example_without_description.yml

@@ -208,7 +208,6 @@ RSpec/ExampleWithoutDescription:
     - 'ee/spec/support/shared_examples/services/audit_events/streaming/headers_operations_shared_examples.rb'
     - 'ee/spec/support/shared_examples/services/onboarding_progress_shared_examples.rb'
     - 'ee/spec/validators/audit_events/http_destination_validator_spec.rb'
-    - 'ee/spec/views/admin/ai/terms_and_conditions/index.html.haml_spec.rb'
     - 'ee/spec/views/admin/application_settings/security_and_compliance.html.haml_spec.rb'
     - 'ee/spec/views/registrations/groups/new.html.haml_spec.rb'
     - 'ee/spec/views/registrations/welcome/show.html.haml_spec.rb'

.rubocop_todo/style/format_string.yml

@@ -132,7 +132,6 @@ Style/FormatString:
     - 'ee/app/helpers/ee/timeboxes_helper.rb'
     - 'ee/app/helpers/vulnerabilities_helper.rb'
     - 'ee/app/mailers/ee/emails/admin_notification.rb'
-    - 'ee/app/models/ci/minutes/notification.rb'
     - 'ee/app/models/dast/profile.rb'
     - 'ee/app/models/dast/site_profile_secret_variable.rb'
     - 'ee/app/models/dast_site_profile.rb'

GITALY_SERVER_VERSION

-70dee0e4de7f471ba5ce1bde2146df4252c1a927
+0173c7eadd49ca64bdd04aa2cc2b47607b09988b

GITLAB_KAS_VERSION

-02454da9094dbb6320c8dcb9cccf26ef41ba9594
+bb5dd9c7ced8de9cf7f5405a34836e6fb7f8e8a4

GITLAB_PAGES_VERSION

-45d5c77a77939f051b23b2052bb171d6314bb8e5
+db58d685d85c5616bc90cdb806e9ee67cfc1c398

GITLAB_SHELL_VERSION

-14.39.0
+14.40.0

Gemfile

@@ -508,7 +508,7 @@ end
 group :development, :test do
   gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared
   gem 'bullet', '~> 7.1.2', feature_category: :shared
-  gem 'parser', '= 3.3.6.0', feature_category: :shared
+  gem 'parser', '= 3.3.7.0', feature_category: :shared
   gem 'pry-byebug', feature_category: :shared
   gem 'pry-rails', '~> 0.3.9', feature_category: :shared
   gem 'pry-shell', '~> 0.6.4', feature_category: :shared
@@ -645,7 +645,7 @@ gem 'ssh_data', '~> 1.3', feature_category: :shared
 gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 17.7.0', feature_category: :gitaly
+gem 'gitaly', '~> 17.8.0', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
 gem 'gitlab-kas-grpc', '~> 17.7.0', feature_category: :deployment_management
@@ -672,7 +672,7 @@ gem 'lograge', '~> 0.5', feature_category: :shared
 gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api
 
 # DNS Lookup
-gem 'gitlab-net-dns', '~> 0.9.2', feature_category: :shared
+gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared
 
 # Countries list
 gem 'countries', '~> 4.0.0', feature_category: :shared

Gemfile.checksum

@@ -220,7 +220,7 @@
 {"name":"gettext","version":"3.4.9","platform":"ruby","checksum":"292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a"},
 {"name":"gettext_i18n_rails","version":"1.13.0","platform":"ruby","checksum":"d4a4739d928b6ce52a2d694d33a831dcb06c7c8e197b3172fc73dfaa20ac8ee6"},
 {"name":"git","version":"1.18.0","platform":"ruby","checksum":"c9b80462e4565cd3d7a9ba8440c41d2c52244b17b0dad0bfddb46de70630c465"},
-{"name":"gitaly","version":"17.7.0","platform":"ruby","checksum":"71b0062985eb22a4ffa69976b5e5aeea43023dd32ff88af082fc2f42cfbdfe3a"},
+{"name":"gitaly","version":"17.8.1","platform":"ruby","checksum":"6268ff47ea4a7480ca116f16dadaeca626eda345a04a0cfef812d2072797d6ed"},
 {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"},
 {"name":"gitlab-chronic","version":"0.10.6","platform":"ruby","checksum":"a244d11a1396d2aac6ae9b2f326adf1605ec1ad20c29f06e8b672047d415a9ac"},
 {"name":"gitlab-cloud-connector","version":"1.0.0","platform":"ruby","checksum":"edf2d13c698e1eb8a6828acefa7c12230f1e47d48212710f1617d5f986d051af"},
@@ -239,7 +239,7 @@
 {"name":"gitlab-license","version":"2.6.0","platform":"ruby","checksum":"2c1f8ae73835640ec77bf758c1d0c9730635043c01cf77902f7976e826d7d016"},
 {"name":"gitlab-mail_room","version":"0.0.25","platform":"ruby","checksum":"223ce7c3c0797b6015eaa37147884e6ddc7be9a7ee90a424358c96bc18613b1a"},
 {"name":"gitlab-markup","version":"1.9.0","platform":"ruby","checksum":"7eda045a08ec2d110084252fa13a8c9eac8bdac0e302035ca7db4b82bcbd7ed4"},
-{"name":"gitlab-net-dns","version":"0.9.2","platform":"ruby","checksum":"f726d978479d43810819f12a45c0906d775a07e34df111bbe693fffbbef3059d"},
+{"name":"gitlab-net-dns","version":"0.10.0","platform":"ruby","checksum":"73b4613d8c851480b7b4e631f117bce4bbb4b6b8073ecf4eb167407e46097c6e"},
 {"name":"gitlab-sdk","version":"0.3.1","platform":"ruby","checksum":"48ba49084f4ab92df7c7ef9f347020d9dfdf6ed9c1e782b67264e98ffe6ea710"},
 {"name":"gitlab-secret_detection","version":"0.18.0","platform":"ruby","checksum":"c143c22c8a70898b11141dd530fc740725835c54a5cd01117c1ecfefab798ae6"},
 {"name":"gitlab-security_report_schemas","version":"0.1.2.min15.0.0.max15.2.1","platform":"ruby","checksum":"300037487ec9d51a814f648514ff521cb82b94fc51d9fe53389175b36ac680ae"},
@@ -510,7 +510,7 @@
 {"name":"pact-support","version":"1.20.0","platform":"ruby","checksum":"41c343a3124fb379684b9ad9f1a0766c5fa18d3b78d433a52e5552d8b9475871"},
 {"name":"paper_trail","version":"15.1.0","platform":"ruby","checksum":"0dbccd97e9d26c54aaea256d2566eaa040a3535601f49a62d79187e77d9ba9f9"},
 {"name":"parallel","version":"1.26.3","platform":"ruby","checksum":"d86babb7a2b814be9f4b81587bf0b6ce2da7d45969fab24d8ae4bf2bb4d4c7ef"},
-{"name":"parser","version":"3.3.6.0","platform":"ruby","checksum":"25d4e67cc4f0f7cab9a2ae1f38e2005b6904d2ea13c34734511d0faad038bc3b"},
+{"name":"parser","version":"3.3.7.0","platform":"ruby","checksum":"7449011771e3e7881297859b849de26a6f4fccd515bece9520a87e7d2116119b"},
 {"name":"parslet","version":"1.8.2","platform":"ruby","checksum":"08d1ab3721cd3f175bfbee8788b2ddff71f92038f2d69bd65454c22bb9fbd98a"},
 {"name":"pastel","version":"0.8.0","platform":"ruby","checksum":"481da9fb7d2f6e6b1a08faf11fa10363172dc40fd47848f096ae21209f805a75"},
 {"name":"peek","version":"1.1.0","platform":"ruby","checksum":"d6501ead8cde46d8d8ed0d59eb6f0ba713d0a41c11a2c4a81447b2dce37b3ecc"},
@@ -709,7 +709,7 @@
 {"name":"sprockets-rails","version":"3.5.1","platform":"ruby","checksum":"c44626cb3887a1a8b572ca258685db33b4ebd041aa73428a716eac444ee5ef48"},
 {"name":"ssh_data","version":"1.3.0","platform":"ruby","checksum":"ec7c1e95a3aebeee412147998f4c147b4b05da6ed0aafda6083f9449318eaac0"},
 {"name":"ssrf_filter","version":"1.0.8","platform":"ruby","checksum":"03f49f54837e407d43ee93ec733a8a94dc1bcf8185647ac61606e63aaedaa0db"},
-{"name":"stackprof","version":"0.2.26","platform":"ruby","checksum":"ee408cbcccd9422aabd66edff8b76a77d67955f2ee1b674961b5dfaa2cc7b8bd"},
+{"name":"stackprof","version":"0.2.27","platform":"ruby","checksum":"aff6d28656c852e74cf632cc2046f849033dc1dedffe7cb8c030d61b5745e80c"},
 {"name":"state_machines","version":"0.5.0","platform":"ruby","checksum":"23e6249d374a920b528dccade403518b4abbd83841a3e2c9ef13e6f1a009b102"},
 {"name":"state_machines-activemodel","version":"0.8.0","platform":"ruby","checksum":"e932dab190d4be044fb5f9cab01a3ea0b092c5f113d4676c6c0a0d49bf738d2c"},
 {"name":"state_machines-activerecord","version":"0.8.0","platform":"ruby","checksum":"072fb701b8ab03de0608297f6c55dc34ed096e556fa8f77e556f3c461c71aab6"},

Gemfile.lock

@@ -718,7 +718,7 @@ GEM
     git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitaly (17.7.0)
+    gitaly (17.8.1)
       grpc (~> 1.0)
     gitlab (4.19.0)
       httparty (~> 0.20)
@@ -764,7 +764,7 @@ GEM
       redis (>= 5, < 6)
       redis-namespace (>= 1.8.2)
     gitlab-markup (1.9.0)
-    gitlab-net-dns (0.9.2)
+    gitlab-net-dns (0.10.0)
     gitlab-sdk (0.3.1)
       activesupport (>= 5.2.0)
       rake (~> 13.0)
@@ -1427,7 +1427,7 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     parslet (1.8.2)
@@ -1803,7 +1803,7 @@ GEM
       sprockets (>= 3.0.0)
     ssh_data (1.3.0)
     ssrf_filter (1.0.8)
-    stackprof (0.2.26)
+    stackprof (0.2.27)
     state_machines (0.5.0)
     state_machines-activemodel (0.8.0)
       activemodel (>= 5.1)
@@ -2081,7 +2081,7 @@ DEPENDENCIES
   gettext (~> 3.4, >= 3.4.9)
   gettext_i18n_rails (~> 1.13.0)
   git (~> 1.8)
-  gitaly (~> 17.7.0)
+  gitaly (~> 17.8.0)
   gitlab-active-context!
   gitlab-backup-cli!
   gitlab-chronic (~> 0.10.5)
@@ -2098,7 +2098,7 @@ DEPENDENCIES
   gitlab-license (~> 2.6)
   gitlab-mail_room (~> 0.0.24)
   gitlab-markup (~> 1.9.0)
-  gitlab-net-dns (~> 0.9.2)
+  gitlab-net-dns (~> 0.10.0)
   gitlab-rspec!
   gitlab-rspec_flaky!
   gitlab-safe_request_store!
@@ -2243,7 +2243,7 @@ DEPENDENCIES
   pact (~> 1.64)
   paper_trail (~> 15.0)
   parallel (~> 1.19)
-  parser (= 3.3.6.0)
+  parser (= 3.3.7.0)
   parslet (~> 1.8)
   peek (~> 1.1)
   pg (~> 1.5.6)