Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

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

@@ -231,7 +231,7 @@ e2e:test-on-gdk:
     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:
+e2e:test-product-analytics:
   extends:
     - .qa:rules:e2e:test-on-gdk
   stage: qa

GITALY_SERVER_VERSION

@@ -1 +1 @@
-90d4f1b1a6f42d95d35bfd21267fda5621ac9a90
+b5a7b5020dc91f9ae06087f87fcd418fc49f5808

app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue

@@ -6,6 +6,7 @@ import {
   GlLoadingIcon,
   GlToggle,
   GlTooltipDirective,
+  GlAnimatedNotificationIcon,
 } from '@gitlab/ui';
 import { createAlert } from '~/alert';
 import { TYPE_ISSUE, TYPE_EPIC, WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants';
@@ -35,6 +36,7 @@ export default {
     GlIcon,
     GlLoadingIcon,
     GlToggle,
+    GlAnimatedNotificationIcon,
     SidebarEditableItem,
   },
   mixins: [glFeatureFlagMixin()],
@@ -228,7 +230,10 @@ export default {
       :class="{ 'gl-ml-2': isIssuable, 'btn-icon': isNotificationsTodosButtons }"
       @click="toggleSubscribed"
     >
-      <gl-icon :name="notificationIcon" :size="16" :class="{ '!gl-fill-blue-500': subscribed }" />
+      <gl-animated-notification-icon
+        :class="{ '!gl-text-blue-500': subscribed }"
+        :is-on="subscribed"
+      />
     </gl-button>
     <gl-button
       v-if="!isMergeRequest"
@@ -240,7 +245,10 @@ export default {
       class="sidebar-collapsed-icon sidebar-collapsed-container !gl-rounded-none !gl-shadow-none"
       @click="toggleSubscribed"
     >
-      <gl-icon :name="notificationIcon" :size="16" :class="{ '!gl-fill-blue-500': subscribed }" />
+      <gl-animated-notification-icon
+        :class="{ '!gl-text-blue-500': subscribed }"
+        :is-on="subscribed"
+      />
     </gl-button>
   </div>
   <sidebar-editable-item

app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue

@@ -1,5 +1,5 @@
 <script>
-import { GlButton, GlIcon, GlTooltipDirective } from '@gitlab/ui';
+import { GlButton, GlTooltipDirective, GlAnimatedTodoIcon } from '@gitlab/ui';
 import { produce } from 'immer';
 import { createAlert } from '~/alert';
 import { TYPE_MERGE_REQUEST } from '~/issues/constants';
@@ -16,8 +16,8 @@ const trackingMixin = Tracking.mixin();
 export default {
   components: {
     GlButton,
-    GlIcon,
     TodoButton,
+    GlAnimatedTodoIcon,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -112,9 +112,6 @@ export default {
       }
       return todoMutationTypes.create;
     },
-    collapsedButtonIcon() {
-      return this.hasTodo ? 'todo-done' : 'todo-add';
-    },
     tootltipTitle() {
       return todoLabel(this.hasTodo);
     },
@@ -203,7 +200,7 @@ export default {
       class="hide-collapsed"
       @click.stop.prevent="toggleTodo"
     >
-      <gl-icon :class="{ 'todo-undone !gl-fill-blue-500': hasTodo }" :name="collapsedButtonIcon" />
+      <gl-animated-todo-icon :class="{ '!gl-text-blue-500': hasTodo }" :is-on="hasTodo" />
     </todo-button>
     <todo-button
       v-else
@@ -224,7 +221,7 @@ export default {
       class="sidebar-collapsed-icon sidebar-collapsed-container !gl-rounded-none !gl-shadow-none"
       @click.stop.prevent="toggleTodo"
     >
-      <gl-icon :class="{ 'todo-undone': hasTodo }" :name="collapsedButtonIcon" />
+      <gl-animated-todo-icon :is-on="hasTodo" />
     </gl-button>
   </div>
 </template>

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue

@@ -3,7 +3,6 @@ import { GlModal, GlLink, GlSprintf } from '@gitlab/ui';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import { escapeShellString } from '~/lib/utils/text_utility';
 import { __ } from '~/locale';
-import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 
 export default {
   i18n: {
@@ -25,15 +24,13 @@ export default {
         help: __('Push the source branch up to GitLab.'),
       },
     },
-    copyCommands: __('Copy commands'),
     tip: __(
       '%{strongStart}Tip:%{strongEnd} You can also %{linkStart}check out with merge request ID%{linkEnd}.',
     ),
     title: __('Check out, review, and resolve locally'),
   },
   components: {
     GlModal,
-    ClipboardButton,
     GlLink,
     GlSprintf,
   },
@@ -113,6 +110,7 @@ export default {
       }
     });
   },
+  userColorScheme: window.gon.user_color_scheme,
 };
 </script>
 
@@ -132,16 +130,16 @@ export default {
       </strong>
       {{ $options.i18n.steps.step1.help }}
     </p>
-    <div class="gl-flex gl-gap-3">
-      <pre class="gl-w-full" data-testid="how-to-merge-instructions">{{ mergeInfo1 }}</pre>
-      <clipboard-button
-        :text="mergeInfo1"
-        :title="$options.i18n.copyCommands"
-        category="tertiary"
-        class="gl-self-start"
-      />
-    </div>
-    <p v-if="reviewingDocsPath">
+    <pre
+      :class="$options.userColorScheme"
+      class="code highlight js-syntax-highlight gl-rounded-base"
+      data-testid="how-to-merge-instructions"
+      >{{ mergeInfo1 }}</pre
+    >
+    <p
+      v-if="reviewingDocsPath"
+      class="-gl-mt-4 gl-rounded-b-base gl-border-1 gl-border-solid gl-border-default gl-px-4 gl-py-3"
+    >
       <gl-sprintf data-testid="docs-tip" :message="$options.i18n.tip">
         <template #strong="{ content }">
           <strong>{{ content }}</strong>
@@ -153,7 +151,6 @@ export default {
         </template>
       </gl-sprintf>
     </p>
-
     <p>
       <strong>
         {{ $options.i18n.steps.step2.label }}
@@ -178,14 +175,11 @@ export default {
       </strong>
       {{ $options.i18n.steps.step4.help }}
     </p>
-    <div class="gl-flex gl-gap-3">
-      <pre class="gl-w-full" data-testid="how-to-merge-instructions">{{ mergeInfo2 }}</pre>
-      <clipboard-button
-        :text="mergeInfo2"
-        :title="$options.i18n.copyCommands"
-        category="tertiary"
-        class="gl-self-start"
-      />
-    </div>
+    <pre
+      :class="$options.userColorScheme"
+      class="code highlight js-syntax-highlight language-shell gl-rounded-base"
+      data-testid="how-to-merge-instructions"
+      >{{ mergeInfo2 }}</pre
+    >
   </gl-modal>
 </template>

app/helpers/sidebars_helper.rb

@@ -101,7 +101,13 @@ def super_sidebar_logged_in_context(user, group:, project:, panel:, panel_type:)
       sign_out_link: destroy_user_session_path,
       issues_dashboard_path: issues_dashboard_path(assignee_username: user.username),
       merge_request_dashboard_path: user.merge_request_dashboard_enabled? ? merge_requests_dashboard_path : nil,
-      todos_dashboard_path: dashboard_todos_path,
+
+      todos_dashboard_path: if Feature.enabled?(:todos_vue_application, user)
+                              vue_dashboard_todos_path
+                            else
+                              dashboard_todos_path
+                            end,
+
       create_new_menu_groups: create_new_menu_groups(group: group, project: project),
       merge_request_menu: create_merge_request_menu(user),
       projects_path: dashboard_projects_path,

config/feature_flags/development/allow_protected_branches_for_group.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383178
 milestone: '15.11'
 type: development
 group: group::source code
-default_enabled: false
+default_enabled: true

db/docs/batched_background_migrations/backfill_approval_merge_request_rule_sources_project_id.yml

@@ -1,8 +1,9 @@
 ---
 migration_job_name: BackfillApprovalMergeRequestRuleSourcesProjectId
-description: Backfills sharding key `approval_merge_request_rule_sources.project_id` from `approval_project_rules`.
+description: Backfills sharding key `approval_merge_request_rule_sources.project_id`
+  from `approval_project_rules`.
 feature_category: code_review_workflow
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151629
 milestone: '17.0'
 queued_migration_version: 20240501044238
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20241001231957'

db/docs/batched_background_migrations/backfill_pages_domain_acme_orders_project_id.yml

@@ -0,0 +1,9 @@
+---
+migration_job_name: BackfillPagesDomainAcmeOrdersProjectId
+description: Backfills sharding key `pages_domain_acme_orders.project_id` from `pages_domains`.
+feature_category: pages
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167614
+milestone: '17.5'
+queued_migration_version: 20240930123732
+finalize_after: '2024-10-22'
+finalized_by: # version of the migration that finalized this BBM

db/docs/batched_background_migrations/deduplicate_lfs_objects_projects.yml

@@ -5,9 +5,13 @@ description: >-
   After the migration is finalized, we need to add a unique index on all three columns to ensure
   data consistency since the unique validation already exists at the model level.
 
-  Originally introduced by https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154323
+  1) Originally introduced by https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154323
   Re-enqueued because we found some duplicates were still being introduced
+
+  2) Originally re-enqueued in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167468
+  Re-enqueued a second time since we found some duplicates when repository_type is NULL
 feature_category: source_code_management
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/164127
-milestone: '17.4'
-queued_migration_version: 20240827204855
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167468
+milestone: '17.5'
+queued_migration_version: 20240927202948
+finalize_after: '2024-10-17' # required upgrade stop due date

db/docs/pages_domain_acme_orders.yml

@@ -4,7 +4,8 @@ classes:
 - PagesDomainAcmeOrder
 feature_categories:
 - pages
-description: Stores ACME order information used in obtaining Let's Encrypt certificates for GitLab Pages domains.
+description: Stores ACME order information used in obtaining Let's Encrypt certificates
+  for GitLab Pages domains.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/14014
 milestone: '12.0'
 gitlab_schema: gitlab_main_cell
@@ -19,3 +20,4 @@ desired_sharding_key:
         table: pages_domains
         sharding_key: project_id
         belongs_to: pages_domain
+desired_sharding_key_migration_job_name: BackfillPagesDomainAcmeOrdersProjectId

db/migrate/20240930123728_add_project_id_to_pages_domain_acme_orders.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProjectIdToPagesDomainAcmeOrders < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def change
+    add_column :pages_domain_acme_orders, :project_id, :bigint
+  end
+end

db/post_migrate/20240827204855_reenqueue_deduplicate_lfs_objects_projects.rb

@@ -13,20 +13,13 @@ class ReenqueueDeduplicateLfsObjectsProjects < Gitlab::Database::Migration[2.2]
 
   restrict_gitlab_migration gitlab_schema: :gitlab_main
 
+  # To be re-enqueued by:
+  # db/post_migrate/20240927202948_reenqueue_deduplicate_lfs_objects_projects_with_null_repository_types.rb
   def up
-    delete_batched_background_migration(MIGRATION, :lfs_objects_projects, :id, [])
-
-    queue_batched_background_migration(
-      MIGRATION,
-      :lfs_objects_projects,
-      :id,
-      job_interval: DELAY_INTERVAL,
-      batch_size: BATCH_SIZE,
-      sub_batch_size: SUB_BATCH_SIZE
-    )
+    # no-op
   end
 
   def down
-    delete_batched_background_migration(MIGRATION, :lfs_objects_projects, :id, [])
+    # no-op
   end
 end

db/post_migrate/20240924095956_remove_default_for_sbom_components_organization_id.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveDefaultForSbomComponentsOrganizationId < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def change
+    change_column_default(:sbom_components, :organization_id, from: 1, to: nil)
+  end
+end

db/post_migrate/20240924101144_remove_default_for_sbom_component_versions_organization_id.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveDefaultForSbomComponentVersionsOrganizationId < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def change
+    change_column_default(:sbom_component_versions, :organization_id, from: 1, to: nil)
+  end
+end

db/post_migrate/20240925061340_remove_default_for_sbom_sources_organization_id.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveDefaultForSbomSourcesOrganizationId < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def change
+    change_column_default(:sbom_sources, :organization_id, from: 1, to: nil)
+  end
+end

db/post_migrate/20240925062324_remove_default_for_sbom_source_packages_organization_id.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveDefaultForSbomSourcePackagesOrganizationId < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def change
+    change_column_default(:sbom_source_packages, :organization_id, from: 1, to: nil)
+  end
+end

db/post_migrate/20240925063116_remove_default_for_vulnerability_exports_organization_id.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveDefaultForVulnerabilityExportsOrganizationId < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def change
+    change_column_default(:vulnerability_exports, :organization_id, from: 1, to: nil)
+  end
+end

db/post_migrate/20240925063151_remove_default_for_vulnerability_export_parts_organization_id.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveDefaultForVulnerabilityExportPartsOrganizationId < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def change
+    change_column_default(:vulnerability_export_parts, :organization_id, from: 1, to: nil)
+  end
+end

db/post_migrate/20240925064050_remove_default_for_dependency_list_export_parts_organization_id.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveDefaultForDependencyListExportPartsOrganizationId < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  def change
+    change_column_default(:dependency_list_export_parts, :organization_id, from: 1, to: nil)
+  end
+end

db/post_migrate/20240927202948_reenqueue_deduplicate_lfs_objects_projects_with_null_repository_types.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class ReenqueueDeduplicateLfsObjectsProjectsWithNullRepositoryTypes < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  MIGRATION = 'DeduplicateLfsObjectsProjects'
+  TABLE_NAME = :lfs_objects_projects
+  DELAY_INTERVAL = 100
+  BATCH_SIZE = 10_000
+  SUB_BATCH_SIZE = 2_500
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  def up
+    delete_batched_background_migration(MIGRATION, :lfs_objects_projects, :id, [])
+
+    queue_batched_background_migration(
+      MIGRATION,
+      :lfs_objects_projects,
+      :id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(MIGRATION, :lfs_objects_projects, :id, [])
+  end
+end