.gitlab-ci.yml

@@ -184,7 +184,7 @@ variables:
   BUILD_OS: "debian"
   OS_VERSION: "bookworm"
   UBI_VERSION: "8.6"
-  CHROME_VERSION: "120"
+  CHROME_VERSION: "123"
   DOCKER_VERSION: "24.0.5"
   RUBYGEMS_VERSION: "3.4"
   BUNDLER_VERSION: "2.5"

.gitlab/CODEOWNERS

@@ -955,7 +955,7 @@ lib/gitlab/checks/**
 /doc/user/project/integrations/beyond_identity.md @msedlakjakubowski
 /doc/user/project/integrations/git_guardian.md @msedlakjakubowski
 /doc/user/project/integrations/github.md @marcel.amirault @lyspin
-/doc/user/project/integrations/google_artifact_registry.md @marcel.amirault
+/doc/user/project/integrations/google_artifact_management.md @marcel.amirault
 /doc/user/project/integrations/harbor.md @marcel.amirault
 /doc/user/project/issues/csv_import.md @eread @ashrafkhamis
 /doc/user/project/members/ @lciutacu

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

@@ -557,6 +557,7 @@
   - ".{eslintrc.yml,eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
   - "*_VERSION"
   - "{,jh/}Gemfile{,.lock}"
+  - "keeps/**/*"
   - "Rakefile"
   - "tests.yml"
   - "config.ru"
@@ -1829,8 +1830,6 @@
     - <<: *if-default-refs
       changes: *setup-test-env-patterns
     - <<: *if-merge-request-labels-run-all-rspec
-    - <<: *if-merge-request
-      changes: *backend-patterns
 
 .rails:rules:clusterwide-db:
   rules:

.rubocop.yml

@@ -1046,7 +1046,6 @@ Cop/RedisQueueUsage:
     - 'lib/gitlab/redis.rb'
     - 'lib/system_check/app/redis_version_check.rb'
     - 'lib/gitlab/mail_room.rb'
-    - 'config/initializers/sidekiq_route_patch.rb'
     - 'lib/gitlab/sidekiq_sharding/scheduled_enq.rb'
     - 'lib/gitlab/sidekiq_sharding/router.rb'
     - 'app/workers/concerns/application_worker.rb'
@@ -1064,11 +1063,11 @@ Cop/SidekiqApiUsage:
     - 'lib/gitlab/sidekiq_queue.rb'
     - 'config/initializers/sidekiq.rb'
     - 'config/initializers/forbid_sidekiq_in_transactions.rb'
-    - 'config/initializers/sidekiq_route_patch.rb'
     - 'lib/gitlab/sidekiq_sharding/scheduled_enq.rb'
     - 'lib/gitlab/sidekiq_sharding/router.rb'
     - 'lib/gitlab/redis/queues.rb'
     - 'app/workers/concerns/application_worker.rb'
+    - 'config/initializers/active_job_shard_support.rb'
 
 Cop/FeatureFlagUsage:
   Include:

.rubocop_todo/layout/line_length.yml

@@ -4720,7 +4720,6 @@ Layout/LineLength:
     - 'spec/views/help/index.html.haml_spec.rb'
     - 'spec/views/layouts/_head.html.haml_spec.rb'
     - 'spec/views/notify/push_to_merge_request_email.text.haml_spec.rb'
-    - 'spec/views/profiles/keys/_form.html.haml_spec.rb'
     - 'spec/views/projects/commits/_commit.html.haml_spec.rb'
     - 'spec/views/projects/imports/new.html.haml_spec.rb'
     - 'spec/views/projects/jobs/_build.html.haml_spec.rb'

.rubocop_todo/layout/space_inside_parens.yml

@@ -212,7 +212,6 @@ Layout/SpaceInsideParens:
     - 'spec/tasks/gitlab/db_rake_spec.rb'
     - 'spec/validators/devise_email_validator_spec.rb'
     - 'spec/views/dashboard/projects/_blank_state_welcome.html.haml_spec.rb'
-    - 'spec/views/profiles/keys/_form.html.haml_spec.rb'
     - 'spec/views/search/_results.html.haml_spec.rb'
     - 'spec/workers/concerns/gitlab/github_import/object_importer_spec.rb'
     - 'spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -1150,7 +1150,6 @@ RSpec/ContextWording:
     - 'spec/features/one_trust_spec.rb'
     - 'spec/features/participants_autocomplete_spec.rb'
     - 'spec/features/profiles/chat_names_spec.rb'
-    - 'spec/features/profiles/keys_spec.rb'
     - 'spec/features/profiles/user_edit_profile_spec.rb'
     - 'spec/features/projects/active_tabs_spec.rb'
     - 'spec/features/projects/activity/user_sees_design_activity_spec.rb'
@@ -2970,7 +2969,6 @@ RSpec/ContextWording:
     - 'spec/views/groups/edit.html.haml_spec.rb'
     - 'spec/views/layouts/application.html.haml_spec.rb'
     - 'spec/views/notify/changed_milestone_email.html.haml_spec.rb'
-    - 'spec/views/profiles/keys/_key.html.haml_spec.rb'
     - 'spec/views/profiles/preferences/show.html.haml_spec.rb'
     - 'spec/views/projects/_home_panel.html.haml_spec.rb'
     - 'spec/views/projects/commit/show.html.haml_spec.rb'

.rubocop_todo/rspec/factory_bot/avoid_create.yml

@@ -576,8 +576,6 @@ RSpec/FactoryBot/AvoidCreate:
     - 'spec/views/notify/pipeline_failed_email.text.erb_spec.rb'
     - 'spec/views/notify/push_to_merge_request_email.text.haml_spec.rb'
     - 'spec/views/user_settings/user_settings/authentication_log.html.haml_spec.rb'
-    - 'spec/views/profiles/keys/_key.html.haml_spec.rb'
-    - 'spec/views/profiles/keys/_key_details.html.haml_spec.rb'
     - 'spec/views/profiles/notifications/show.html.haml_spec.rb'
     - 'spec/views/projects/_flash_messages.html.haml_spec.rb'
     - 'spec/views/projects/_home_panel.html.haml_spec.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -1577,7 +1577,6 @@ RSpec/FeatureCategory:
     - 'spec/controllers/profiles/avatars_controller_spec.rb'
     - 'spec/controllers/profiles/emails_controller_spec.rb'
     - 'spec/controllers/profiles/gpg_keys_controller_spec.rb'
-    - 'spec/controllers/profiles/keys_controller_spec.rb'
     - 'spec/controllers/profiles/notifications_controller_spec.rb'
     - 'spec/controllers/profiles/preferences_controller_spec.rb'
     - 'spec/controllers/profiles/webauthn_registrations_controller_spec.rb'
@@ -2465,7 +2464,6 @@ RSpec/FeatureCategory:
     - 'spec/initializers/hashie_mash_permitted_patch_spec.rb'
     - 'spec/initializers/lograge_spec.rb'
     - 'spec/initializers/mail_encoding_patch_spec.rb'
-    - 'spec/initializers/mailer_retries_spec.rb'
     - 'spec/initializers/microsoft_graph_mailer_spec.rb'
     - 'spec/initializers/net_http_patch_spec.rb'
     - 'spec/initializers/omniauth_spec.rb'
@@ -5298,8 +5296,6 @@ RSpec/FeatureCategory:
     - 'spec/views/notify/pipeline_success_email.html.haml_spec.rb'
     - 'spec/views/notify/pipeline_success_email.text.erb_spec.rb'
     - 'spec/views/notify/push_to_merge_request_email.text.haml_spec.rb'
-    - 'spec/views/profiles/keys/_form.html.haml_spec.rb'
-    - 'spec/views/profiles/keys/_key_details.html.haml_spec.rb'
     - 'spec/views/profiles/notifications/show.html.haml_spec.rb'
     - 'spec/views/profiles/preferences/show.html.haml_spec.rb'
     - 'spec/views/projects/_flash_messages.html.haml_spec.rb'

.rubocop_todo/style/class_and_module_children.yml

@@ -107,9 +107,7 @@ Style/ClassAndModuleChildren:
     - 'app/controllers/profiles/avatars_controller.rb'
     - 'app/controllers/profiles/chat_names_controller.rb'
     - 'app/controllers/profiles/emails_controller.rb'
-    - 'app/controllers/profiles/gpg_keys_controller.rb'
     - 'app/controllers/profiles/groups_controller.rb'
-    - 'app/controllers/profiles/keys_controller.rb'
     - 'app/controllers/profiles/notifications_controller.rb'
     - 'app/controllers/profiles/preferences_controller.rb'
     - 'app/controllers/profiles/two_factor_auths_controller.rb'

.rubocop_todo/style/format_string.yml

@@ -290,6 +290,5 @@ Style/FormatString:
     - 'spec/support/shared_examples/views/registration_features_prompt_shared_examples.rb'
     - 'spec/validators/any_field_validator_spec.rb'
     - 'spec/views/groups/edit.html.haml_spec.rb'
-    - 'spec/views/profiles/keys/_form.html.haml_spec.rb'
     - 'spec/views/profiles/notifications/show.html.haml_spec.rb'
     - 'tooling/lib/tooling/find_codeowners.rb'

.rubocop_todo/style/if_unless_modifier.yml

@@ -881,7 +881,6 @@ Style/IfUnlessModifier:
     - 'spec/support/shared_examples/views/registration_features_prompt_shared_examples.rb'
     - 'spec/support/shared_examples/workers/batched_background_migration_worker_shared_examples.rb'
     - 'spec/support/webmock.rb'
-    - 'spec/views/profiles/keys/_key.html.haml_spec.rb'
     - 'spec/workers/analytics/usage_trends/counter_job_worker_spec.rb'
     - 'tooling/danger/analytics_instrumentation.rb'
     - 'tooling/lib/tooling/find_codeowners.rb'

GITALY_SERVER_VERSION

-6abde2303696a63f9eec85365b144c3b208d8043
+2bde9ceaa35d824fa4a22cc04488da02f7522197

GITLAB_SHELL_VERSION

-14.34.0
+14.35.0

Gemfile.checksum

@@ -84,7 +84,7 @@
 {"name":"coercible","version":"1.0.0","platform":"ruby","checksum":"5081ad24352cc8435ce5472bc2faa30260c7ea7f2102cc6a9f167c4d9bffaadc"},
 {"name":"colored2","version":"3.1.2","platform":"ruby","checksum":"b13c2bd7eeae2cf7356a62501d398e72fde78780bd26aec6a979578293c28b4a"},
 {"name":"commonmarker","version":"0.23.10","platform":"ruby","checksum":"fdd312ae2bb4071b2f3085d4d7533cb9f8d9057a2eaa0760228a65bc3ed565d1"},
-{"name":"concurrent-ruby","version":"1.2.2","platform":"ruby","checksum":"3879119b8b75e3b62616acc256c64a134d0b0a7a9a3fcba5a233025bcde22c4f"},
+{"name":"concurrent-ruby","version":"1.2.3","platform":"ruby","checksum":"82fdd3f8a0816e28d513e637bb2b90a45d7b982bdf4f3a0511722d2e495801e2"},
 {"name":"connection_pool","version":"2.4.1","platform":"ruby","checksum":"0f40cf997091f1f04ff66da67eabd61a9fe0d4928b9a3645228532512fab62f4"},
 {"name":"cork","version":"0.3.0","platform":"ruby","checksum":"a0a0ac50e262f8514d1abe0a14e95e71c98b24e3378690e5d044daf0013ad4bc"},
 {"name":"cose","version":"1.3.0","platform":"ruby","checksum":"63247c66a5bc76e53926756574fe3724cc0a88707e358c90532ae2a320e98601"},
@@ -312,7 +312,7 @@
 {"name":"http-form_data","version":"2.3.0","platform":"ruby","checksum":"cc4eeb1361d9876821e31d7b1cf0b68f1cf874b201d27903480479d86448a5f3"},
 {"name":"httparty","version":"0.21.0","platform":"ruby","checksum":"00ef7bf9a71f30a3bff88edeb5b16a34bea883ab67c246b3f0db2d6794fe1214"},
 {"name":"httpclient","version":"2.8.3","platform":"ruby","checksum":"2951e4991214464c3e92107e46438527d23048e634f3aee91c719e0bdfaebda6"},
-{"name":"i18n","version":"1.14.1","platform":"ruby","checksum":"9d03698903547c060928e70a9bc8b6b87fda674453cda918fc7ab80235ae4a61"},
+{"name":"i18n","version":"1.14.4","platform":"ruby","checksum":"c7deedead0866ea9102975a4eab7968f53de50793a0c211a37808f75dd187551"},
 {"name":"i18n_data","version":"0.13.1","platform":"ruby","checksum":"e5aa99b09a69b463bb0443fc1f9540351a49f3d1541c5e91316bafa035c63f66"},
 {"name":"icalendar","version":"2.8.0","platform":"ruby","checksum":"e404f970c7572bdebf6f09f9890970b68aab400ba9e609dc7d46098f28d0ee87"},
 {"name":"ice_cube","version":"0.16.4","platform":"ruby","checksum":"da117e5de24bdc33931be629f9b55048641924442c7e9b72fedc05e5592531b7"},

Gemfile.lock

@@ -27,6 +27,8 @@ PATH
   remote: gems/gitlab-backup-cli
   specs:
     gitlab-backup-cli (0.0.1)
+      activesupport (~> 7.0.8)
+      rainbow (~> 3.0)
       thor (~> 1.3)
 
 PATH
@@ -414,7 +416,7 @@ GEM
       descendants_tracker (~> 0.0.1)
     colored2 (3.1.2)
     commonmarker (0.23.10)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -951,7 +953,7 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     i18n_data (0.13.1)
     icalendar (2.8.0)

app/assets/javascripts/analytics/shared/constants.js

@@ -234,7 +234,7 @@ export const METRIC_TOOLTIPS = {
   },
   [AI_METRICS.CODE_SUGGESTIONS_USAGE_RATE]: {
     description: s__(
-      'ValueStreamAnalytics|Monthly user engagement with AI Code Suggestions. Percentage ratio calculated as monthly unique Code Suggestions users / total monthly unique contributors.',
+      'ValueStreamAnalytics|Monthly user engagement with AI Code Suggestions. Percentage ratio calculated as monthly unique Code Suggestions users / total monthly unique code contributors.',
     ),
     groupLink: '',
     projectLink: '',

app/assets/javascripts/ci/catalog/components/list/catalog_header.vue

@@ -3,7 +3,6 @@ import { GlBanner, GlLink } from '@gitlab/ui';
 import ChatBubbleSvg from '@gitlab/svgs/dist/illustrations/chat-sm.svg?url';
 import { __, s__ } from '~/locale';
 import { helpPagePath } from '~/helpers/help_page_helper';
-import BetaBadge from '~/vue_shared/components/badges/beta_badge.vue';
 import { CATALOG_FEEDBACK_DISMISSED_KEY } from '../../constants';
 
 const defaultTitle = __('CI/CD Catalog');
@@ -13,7 +12,6 @@ const defaultDescription = s__(
 
 export default {
   components: {
-    BetaBadge,
     GlBanner,
     GlLink,
   },
@@ -63,10 +61,7 @@ export default {
         {{ $options.i18n.banner.description }}
       </p>
     </gl-banner>
-    <div class="gl-my-4 gl-display-flex gl-align-items-center">
-      <h1 class="gl-m-0 gl-font-size-h-display">{{ pageTitle }}</h1>
-      <beta-badge class="gl-ml-3" />
-    </div>
+    <h1 class="page-title gl-font-size-h-display">{{ pageTitle }}</h1>
     <p>
       <span data-testid="page-description">{{ pageDescription }}</span>
       <gl-link :href="$options.learnMorePath" target="_blank">{{

app/assets/javascripts/ci/catalog/components/list/ci_resources_list_item.vue

@@ -111,9 +111,6 @@ export default {
     },
   },
   methods: {
-    isNotLastComponentName(index, length) {
-      return index !== length - 1;
-    },
     getComponent(index) {
       return this.components[Number(index)];
     },
@@ -192,7 +189,7 @@ export default {
             class="gl-font-sm gl-mt-1 gl-display-inline-flex gl-flex-wrap gl-text-gray-900"
           >
             <span class="gl-font-weight-bold"> &#8226; {{ $options.i18n.components }} </span>
-            <gl-sprintf :message="componentNamesSprintfMessage" class="gl-text-gray-900">
+            <gl-sprintf :message="componentNamesSprintfMessage">
               <template #component="{ content }">
                 <gl-truncate
                   class="gl-max-w-30 gl-ml-2"

app/assets/javascripts/clusters_list/components/clusters_actions.vue

@@ -91,8 +91,6 @@ export default {
       :title="$options.i18n.actionsDisabledHint"
     />
 
-    <!--TODO: Replace button-group workaround once `split` option for new dropdowns is implemented.-->
-    <!-- See issue at https://gitlab.com/gitlab-org/gitlab-ui/-/issues/2263-->
     <gl-button-group ref="actions" class="gl-w-full gl-mb-3 gl-md-w-auto gl-md-mb-0">
       <gl-button
         v-gl-modal-directive="shouldTriggerModal && $options.INSTALL_AGENT_MODAL_ID"
@@ -106,8 +104,6 @@ export default {
       </gl-button>
       <gl-disclosure-dropdown
         v-if="actionItems.length"
-        class="split"
-        toggle-class="gl-rounded-top-left-none! gl-rounded-bottom-left-none! gl-pl-1!"
         category="primary"
         variant="confirm"
         placement="right"