Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

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

@@ -66,7 +66,7 @@ db:rollback:
     - .db-job-base
     - .rails:rules:db-rollback
   script:
-    - bundle exec rake db:migrate VERSION=20230721095222  # First 16-4-stable-ee migration
+    - bundle exec rake db:migrate VERSION=20230721095222 # First 16-5-stable-ee migration
     - bundle exec rake db:migrate
 
 db:rollback single-db:

.rubocop_todo/gitlab/bounded_contexts.yml

@@ -3244,7 +3244,6 @@ Gitlab/BoundedContexts:
     - 'ee/app/services/epics/epic_links/list_service.rb'
     - 'ee/app/services/epics/epic_links/update_service.rb'
     - 'ee/app/services/epics/issue_promote_service.rb'
-    - 'ee/app/services/epics/related_epic_links/create_service.rb'
     - 'ee/app/services/epics/related_epic_links/destroy_service.rb'
     - 'ee/app/services/epics/related_epic_links/list_service.rb'
     - 'ee/app/services/epics/reopen_service.rb'

.rubocop_todo/layout/line_break_after_final_mixin.yml

@@ -46,7 +46,6 @@ Layout/LineBreakAfterFinalMixin:
     - 'app/workers/user_status_cleanup/batch_worker.rb'
     - 'app/workers/users/create_statistics_worker.rb'
     - 'db/migrate/20240213223630_add_duo_features_enabled_cascading_setting.rb'
-    - 'db/post_migrate/20231017064317_swap_columns_for_ci_pipeline_variables_pipeline_id_bigint.rb'
     - 'db/post_migrate/20231122111935_drop_index_web_hook_logs_part_on_web_hook_id.rb'
     - 'db/post_migrate/20240122071840_ensure_backfill_for_ci_builds_integer_columns_is_finished.rb'
     - 'db/post_migrate/20240419122328_swap_vulnerability_feedback_pipeline_id_convert_to_bigint.rb'

.rubocop_todo/layout/line_length.yml

@@ -1762,7 +1762,6 @@ Layout/LineLength:
     - 'ee/spec/services/elastic/process_initial_bookkeeping_service_spec.rb'
     - 'ee/spec/services/epic_issues/create_service_spec.rb'
     - 'ee/spec/services/epics/issue_promote_service_spec.rb'
-    - 'ee/spec/services/epics/related_epic_links/create_service_spec.rb'
     - 'ee/spec/services/epics/update_service_spec.rb'
     - 'ee/spec/services/external_status_checks/update_service_spec.rb'
     - 'ee/spec/services/geo/blob_download_service_spec.rb'

.rubocop_todo/lint/unused_method_argument.yml

@@ -235,7 +235,6 @@ Lint/UnusedMethodArgument:
     - 'ee/app/services/audit_events/runners_token_audit_event_service.rb'
     - 'ee/app/services/boards/epic_lists/update_service.rb'
     - 'ee/app/services/concerns/incident_management/oncall_rotations/shared_rotation_logic.rb'
-    - 'ee/app/services/epics/related_epic_links/create_service.rb'
     - 'ee/app/services/epics/transfer_service.rb'
     - 'ee/app/services/group_saml/identity/destroy_service.rb'
     - 'ee/app/services/projects/update_mirror_service.rb'

.rubocop_todo/migration/ensure_factory_for_table.yml

@@ -1,15 +1,10 @@
 ---
 Migration/EnsureFactoryForTable:
   Exclude:
-    - 'db/migrate/20230915103259_create_ci_finished_build_ch_sync_events.rb'
     - 'db/migrate/20230926092914_add_approval_group_rules.rb'
     - 'db/migrate/20230926092944_add_approval_group_rules_groups.rb'
     - 'db/migrate/20230926093004_add_approval_group_rules_users.rb'
     - 'db/migrate/20230926093025_add_approval_group_rules_protected_branches.rb'
-    - 'db/migrate/20230926133801_create_value_stream_analytics_settings.rb'
-    - 'db/migrate/20230930094139_add_related_link_restrictions.rb'
-    - 'db/migrate/20231003073437_create_abuse_report_user_mentions.rb'
-    - 'db/migrate/20231004100000_create_container_registry_protection_rules.rb'
     - 'db/migrate/20231017095738_create_activity_pub_releases_subscriptions.rb'
     - 'db/migrate/20231017134349_create_ml_model_metadata.rb'
     - 'db/migrate/20231020095624_create_audit_events_streaming_http_group_namespace_filters.rb'

.rubocop_todo/rspec/before_all_role_assignment.yml

@@ -567,7 +567,6 @@ RSpec/BeforeAllRoleAssignment:
     - 'ee/spec/services/epics/create_service_spec.rb'
     - 'ee/spec/services/epics/epic_links/create_service_spec.rb'
     - 'ee/spec/services/epics/issue_promote_service_spec.rb'
-    - 'ee/spec/services/epics/related_epic_links/create_service_spec.rb'
     - 'ee/spec/services/epics/related_epic_links/list_service_spec.rb'
     - 'ee/spec/services/epics/reopen_service_spec.rb'
     - 'ee/spec/services/epics/transfer_service_spec.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -665,7 +665,6 @@ RSpec/ContextWording:
     - 'ee/spec/services/epic_issues/update_service_spec.rb'
     - 'ee/spec/services/epics/create_service_spec.rb'
     - 'ee/spec/services/epics/epic_links/list_service_spec.rb'
-    - 'ee/spec/services/epics/related_epic_links/create_service_spec.rb'
     - 'ee/spec/services/epics/related_epic_links/destroy_service_spec.rb'
     - 'ee/spec/services/epics/update_service_spec.rb'
     - 'ee/spec/services/external_status_checks/dispatch_service_spec.rb'

.rubocop_todo/rspec/expect_change.yml

@@ -102,7 +102,6 @@ RSpec/ExpectChange:
     - 'ee/spec/services/elastic/indexing_control_service_spec.rb'
     - 'ee/spec/services/epic_issues/create_service_spec.rb'
     - 'ee/spec/services/epics/issue_promote_service_spec.rb'
-    - 'ee/spec/services/epics/related_epic_links/create_service_spec.rb'
     - 'ee/spec/services/epics/transfer_service_spec.rb'
     - 'ee/spec/services/geo/container_repository_registry_removal_service_spec.rb'
     - 'ee/spec/services/geo/file_registry_removal_service_spec.rb'

.rubocop_todo/rspec/receive_messages.yml

@@ -158,7 +158,6 @@ RSpec/ReceiveMessages:
     - 'ee/spec/services/ee/spam/spam_verdict_service_spec.rb'
     - 'ee/spec/services/ee/work_items/related_work_item_links/create_service_spec.rb'
     - 'ee/spec/services/epic_issues/create_service_spec.rb'
-    - 'ee/spec/services/epics/related_epic_links/create_service_spec.rb'
     - 'ee/spec/services/geo/container_repository_sync_spec.rb'
     - 'ee/spec/services/geo/framework_repository_sync_service_spec.rb'
     - 'ee/spec/services/gitlab_subscriptions/create_service_spec.rb'

.rubocop_todo/style/hash_each_methods.yml

@@ -32,7 +32,6 @@ Style/HashEachMethods:
     - 'app/services/security/merge_reports_service.rb'
     - 'config/initializers/6_validations.rb'
     - 'config/initializers/8_gitaly.rb'
-    - 'db/post_migrate/20230906102738_sync_index_for_ci_sources_pipelines_pipeline_id_bigint.rb'
     - 'db/post_migrate/20240422070036_swap_ci_pipelines_pk_with_bigint_p_ci_builds_p_ci_stages.rb'
     - 'ee/app/graphql/types/compliance_management/merge_requests/compliance_violation_reason_enum.rb'
     - 'ee/app/graphql/types/compliance_management/merge_requests/compliance_violation_severity_enum.rb'

.rubocop_todo/style/inline_disable_annotation.yml

@@ -998,19 +998,10 @@ Style/InlineDisableAnnotation:
     - 'config/routes/project.rb'
     - 'danger/ce_ee_vue_templates/Dangerfile'
     - 'danger/roulette/Dangerfile'
-    - 'db/migrate/20230915103259_create_ci_finished_build_ch_sync_events.rb'
-    - 'db/migrate/20230917144717_add_package_name_pattern_query_to_packages_protection_rule.rb'
-    - 'db/migrate/20230921081527_add_queued_migration_version_to_batched_background_migrations.rb'
     - 'db/migrate/20231017135207_add_fields_to_ml_model.rb'
     - 'db/migrate/20231019180421_add_name_description_to_catalog_resources.rb'
     - 'db/migrate/20231024142236_add_fields_to_bulk_import_failures.rb'
-    - 'db/post_migrate/20230908033511_swap_columns_for_ci_pipeline_chat_data_pipeline_id_bigint.rb'
-    - 'db/post_migrate/20230924134453_cleanup_uuid_type_migration_on_vulnerability_occurrences.rb'
     - 'db/post_migrate/20231003045342_migrate_sidekiq_namespaced_jobs.rb'
-    - 'db/post_migrate/20231003142534_add_build_timeout_index.rb'
-    - 'db/post_migrate/20231005131445_add_work_items_related_link_restrictions.rb'
-    - 'db/post_migrate/20231009105056_index_users_on_email_domain_and_id.rb'
-    - 'db/post_migrate/20231017172156_add_index_on_projects_for_adjourned_deletion.rb'
     - 'db/post_migrate/20231018083247_remove_users_email_opted_in_columns.rb'
     - 'ee/app/controllers/admin/application_settings/scim_oauth_controller.rb'
     - 'ee/app/controllers/admin/emails_controller.rb'

GITALY_SERVER_VERSION

@@ -1 +1 @@
-9a94e7c7c19fce3afb5c36d045195c06e50ce3ca
+76e33b6eb327e8ab10102c2d332a40f4fdc3a4b5

GITLAB_KAS_VERSION

@@ -1 +1 @@
-2f84f1083ebc22f6efe3ab00355ef5170bcbc142
+14515d822147fed159ea9d11ab04f097630ef075

app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue

@@ -87,7 +87,7 @@ export default {
             {{ s__('ValueStreamEvent|Only items that reached their stop event.') }}
           </div>
         </div>
-        <div class="gl-border-t-1 gl-border-gray-50 gl-px-4 gl-pt-4 gl-border-t-solid">
+        <div class="gl-border-t-1 gl-border-subtle gl-px-4 gl-pt-4 gl-border-t-solid">
           <div v-if="pathItem.startEventHtmlDescription" class="gl-flex gl-flex-row">
             <div class="metric-label gl-flex gl-flex-col gl-pb-3 gl-pr-4">
               {{ s__('ValueStreamEvent|Start') }}

app/assets/javascripts/boards/components/board_card_loading_skeleton.vue

@@ -11,7 +11,7 @@ export default {
 
 <template>
   <div
-    class="board-card-skeleton gl-mb-3 gl-rounded-base gl-border-1 gl-border-solid gl-border-gray-50 gl-bg-white gl-p-5"
+    class="board-card-skeleton gl-mb-3 gl-rounded-base gl-border-1 gl-border-solid gl-border-subtle gl-bg-white gl-p-5"
   >
     <div class="board-card-skeleton-inner">
       <gl-skeleton-loader :width="340" :height="100">

app/assets/javascripts/ci/job_details/components/sidebar/sidebar.vue

@@ -95,36 +95,36 @@ export default {
           @updateVariables="$emit('updateVariables')"
         />
 
-        <job-sidebar-details-container class="gl-border-b gl-border-gray-50 gl-py-4" />
+        <job-sidebar-details-container class="gl-border-b gl-border-subtle gl-py-4" />
 
         <artifacts-block
           v-if="hasArtifact"
-          class="gl-border-b gl-border-gray-50 gl-py-4"
+          class="gl-border-b gl-border-subtle gl-py-4"
           :artifact="artifact"
           :help-url="artifactHelpUrl"
         />
 
         <external-links-block
           v-if="hasExternalLinks"
-          class="gl-border-b gl-border-gray-50 gl-py-4"
+          class="gl-border-b gl-border-subtle gl-py-4"
           :external-links="externalLinks"
         />
 
         <trigger-block
           v-if="hasTriggers"
-          class="gl-border-b gl-border-gray-50 gl-py-4"
+          class="gl-border-b gl-border-subtle gl-py-4"
           :trigger="job.trigger"
         />
 
         <commit-block
-          class="gl-border-b gl-border-gray-50 gl-py-4"
+          class="gl-border-b gl-border-subtle gl-py-4"
           :commit="commit"
           :merge-request="job.merge_request"
         />
 
         <stages-dropdown
           v-if="job.pipeline"
-          class="gl-border-b gl-border-gray-50 gl-py-4"
+          class="gl-border-b gl-border-subtle gl-py-4"
           :pipeline="job.pipeline"
           :selected-stage="selectedStage"
           :stages="stages"

app/assets/javascripts/ide/ide_router.js

@@ -31,7 +31,7 @@ Vue.use(IdeRouter);
 
 // Unfortunately Vue Router doesn't work without at least a fake component
 // If you do only data handling
-const EmptyRouterComponent = {
+export const EmptyRouterComponent = {
   render(createElement) {
     return createElement('div');
   },

app/assets/javascripts/issuable/components/csv_export_modal.vue

@@ -81,7 +81,7 @@ export default {
     data-testid="export-issuable-modal"
   >
     <div
-      class="gl-items-center gl-justify-start gl-border-1 gl-border-gray-50 gl-p-4 gl-border-b-solid"
+      class="gl-items-center gl-justify-start gl-border-1 gl-border-subtle gl-p-4 gl-border-b-solid"
     >
       <gl-icon name="check" class="gl-color-green-400" />
       <strong class="gl-m-3">{{ issuableCountText }}</strong>

app/assets/javascripts/issues/show/components/incidents/create_timeline_event.vue

@@ -116,7 +116,7 @@ export default {
     </div>
     <timeline-events-form
       ref="eventForm"
-      :class="{ 'gl-border-t gl-border-gray-50 gl-pt-3': hasTimelineEvents }"
+      :class="{ 'gl-border-t gl-border-subtle gl-pt-3': hasTimelineEvents }"
       :is-event-processed="createTimelineEventActive"
       show-save-and-add
       @save-event="createIncidentTimelineEvent"

app/assets/javascripts/issues/show/components/incidents/timeline_events_form.vue

@@ -173,7 +173,7 @@ export default {
 </script>
 
 <template>
-  <form class="gl-grow gl-border-gray-50">
+  <form class="gl-grow gl-border-subtle">
     <div class="gl-mt-3 gl-flex gl-flex-col sm:gl-flex-row">
       <gl-form-group :label="__('Date')" class="gl-mr-5">
         <gl-datepicker id="incident-date" ref="datepicker" v-model="datePickerInput" />

app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue

@@ -138,7 +138,7 @@ export default {
       class="timeline-group"
     >
       <h2
-        class="gl-my-0 gl-border-1 gl-border-gray-50 gl-py-5 gl-text-size-h2 gl-border-b-solid"
+        class="gl-my-0 gl-border-1 gl-border-subtle gl-py-5 gl-text-size-h2 gl-border-b-solid"
         data-testid="event-date"
       >
         {{ eventDate }}

app/assets/javascripts/pages/dashboard/todos/index/todos.js

@@ -138,10 +138,10 @@ export default class Todos {
       restoreBtn.classList.add('hidden');
       doneBtn.classList.remove('hidden');
     } else if (target === doneBtn) {
-      row.classList.add('done-reversible', 'gl-bg-gray-10', 'gl-border-gray-50');
+      row.classList.add('done-reversible', 'gl-bg-gray-10', 'gl-border-subtle');
       restoreBtn.classList.remove('hidden');
     } else if (target === restoreBtn) {
-      row.classList.remove('done-reversible', 'gl-bg-gray-10', 'gl-border-gray-50');
+      row.classList.remove('done-reversible', 'gl-bg-gray-10', 'gl-border-subtle');
       doneBtn.classList.remove('hidden');
     } else {
       row.parentNode.removeChild(row);

app/assets/javascripts/vue_shared/components/notes/system_note.vue

@@ -158,7 +158,7 @@ export default {
         iconBgClass,
         {
           'system-note-icon -gl-mt-1 gl-ml-2 gl-h-6 gl-w-6': isAllowedIcon,
-          'system-note-dot -gl-top-1 gl-ml-4 gl-mt-3 gl-h-3 gl-w-3 gl-border-2 gl-border-solid gl-border-gray-50 gl-bg-gray-900':
+          'system-note-dot -gl-top-1 gl-ml-4 gl-mt-3 gl-h-3 gl-w-3 gl-border-2 gl-border-solid gl-border-subtle gl-bg-gray-900':
             !isAllowedIcon,
         },
       ]"

app/assets/javascripts/work_items/components/notes/system_note.vue

@@ -126,7 +126,7 @@ export default {
         getIconColor,
         {
           'system-note-icon -gl-mt-1 gl-ml-2 gl-h-6 gl-w-6': isAllowedIcon,
-          'system-note-dot -gl-top-1 gl-ml-4 gl-mt-3 gl-h-3 gl-w-3 gl-border-2 gl-border-solid gl-border-gray-50 gl-bg-gray-900':
+          'system-note-dot -gl-top-1 gl-ml-4 gl-mt-3 gl-h-3 gl-w-3 gl-border-2 gl-border-solid gl-border-subtle gl-bg-gray-900':
             !isAllowedIcon,
         },
       ]"

app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue

@@ -340,7 +340,7 @@ export default {
     />
     <template v-if="workItemCrmContacts">
       <work-item-crm-contacts
-        class="gl-border-t gl-mb-5 gl-border-gray-50 gl-pt-5"
+        class="gl-border-t gl-mb-5 gl-border-subtle gl-pt-5"
         :full-path="fullPath"
         :work-item-id="workItem.id"
         :work-item-iid="workItem.iid"

app/assets/stylesheets/page_bundles/incidents.scss

@@ -83,7 +83,7 @@
     &::after {
       content: '';
       position: absolute;
-      @apply gl-border-gray-50;
+      @apply gl-border-subtle;
       @apply gl-border-1;
       @apply gl-border-b-solid;
       // Border spans the whole container minus icon width and grid gap

app/models/integrations/packagist.rb

@@ -6,22 +6,22 @@ class Packagist < Integration
 
     field :username,
       title: -> { _('Username') },
-      help: -> { _('Enter your Packagist username.') },
+      help: -> { _('Username of a Packagist account.') },
       placeholder: '',
       required: true
 
     field :token,
       type: :password,
       title: -> { _('Token') },
-      help: -> { _('Enter your Packagist token.') },
+      help: -> { _('API token of the Packagist server.') },
       non_empty_password_title: -> { s_('ProjectService|Enter new token') },
       non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current token.') },
       placeholder: '',
       required: true
 
     field :server,
-      title: -> { s_('Server (optional)') },
-      help: -> { s_('Enter your Packagist server. Defaults to https://packagist.org.') },
+      title: -> { _('Server (optional)') },
+      help: -> { _('URL of the Packagist server. The default value is `https://packagist.org`.') },
       placeholder: 'https://packagist.org',
       exposes_secrets: true,
       required: false

app/models/project_setting.rb

@@ -9,6 +9,8 @@ class ProjectSetting < ApplicationRecord
 
   belongs_to :project, inverse_of: :project_setting
 
+  ignore_column :pages_multiple_versions_enabled, remove_with: '17.9', remove_after: '2025-02-20'
+
   scope :for_projects, ->(projects) { where(project_id: projects) }
   scope :with_namespace, -> { joins(project: :namespace) }
 

app/views/dashboard/todos/_todo.html.haml

@@ -1,4 +1,4 @@
-%li.todo.gl-border-t.gl-border-gray-50.hover:gl-border-blue-200.hover:gl-bg-blue-50.hover:gl-cursor-pointer.gl-relative{ class: "hover:gl-z-1 todo-#{todo.done? ? 'done' : 'pending'}", id: dom_id(todo) }
+%li.todo.gl-border-t.gl-border-subtle.hover:gl-border-blue-200.hover:gl-bg-blue-50.hover:gl-cursor-pointer.gl-relative{ class: "hover:gl-z-1 todo-#{todo.done? ? 'done' : 'pending'}", id: dom_id(todo) }
   .gl-flex.gl-flex-col.sm:gl-flex-row.sm:gl-items-center
     .todo-item.gl-overflow-hidden.gl-overflow-x-auto.gl-self-center.gl-w-full{ data: { testid: "todo-item-container" } }
       .todo-title.gl-pt-2.gl-pb-3.gl-px-2.gl-md-mb-1.gl-text-sm.gl-text-subtle

app/views/projects/pages/_pages_settings.html.haml

@@ -20,16 +20,5 @@
       %p.gl-pl-6
         = s_("GitLabPages|When enabled, a unique domain is generated to access pages.").html_safe
 
-  - if can?(current_user, :pages_multiple_versions, @project)
-    .form-group
-      = f.fields_for :project_setting do |settings|
-        = settings.gitlab_ui_checkbox_component :pages_multiple_versions_enabled,
-          s_('GitLabPages|Enable parallel deployments'),
-          label_options: { class: 'label-bold' }
-        %p.gl-pl-6
-          = safe_format(s_("GitLabPages|When enabled, you can create parallel deployments of your pages site. %{docs_link_start}Learn more.%{link_end}"),
-              tag_pair(tag.a(href: help_page_path('user/project/pages/index.md', anchor: 'parallel-deployments'), target: '_blank'),
-              :docs_link_start, :link_end))
-
   .gl-mt-3
     = f.submit s_('GitLabPages|Save changes'), pajamas_button: true

config/events/1655841083_projects_settings_cicd_show_render.yml

@@ -7,7 +7,9 @@ identifiers:
   - project
   - user
   - namespace
-product_group: pipeline_authoring
+product_group: pipeline_security
+product_categories:
+- secrets_management
 milestone: "15.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
 distributions:

config/events/1655841352_projects_settings_cicd_show_upload.yml

@@ -7,7 +7,9 @@ identifiers:
   - project
   - user
   - namespace
-product_group: pipeline_authoring
+product_group: pipeline_security
+product_categories:
+- secrets_management
 milestone: "15.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
 distributions:

config/events/1655841364_projects_settings_cicd_show_delete.yml

@@ -7,7 +7,9 @@ identifiers:
   - project
   - user
   - namespace
-product_group: pipeline_authoring
+product_group: pipeline_security
+product_categories:
+- secrets_management
 milestone: "15.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
 distributions:

config/events/1674843937_Ci__Build_create_id_tokens.yml

@@ -7,7 +7,9 @@ extra_properties:
 identifiers:
 - user
 - namespace
-product_group: pipeline_authoring
+product_group: pipeline_security
+product_categories:
+- secrets_management
 milestone: "15.9"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110422
 distributions:

config/events/pull_manifest_from_cache.yml

@@ -0,0 +1,15 @@
+---
+description: Tracks when a cached manifest is pulled from the package registry
+action: pull_manifest_from_cache
+identifiers:
+- namespace
+- user
+product_group: container_registry
+milestone: '14.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173882
+distributions:
+- ce
+tiers:
+- free
+- premium
+- ultimate