Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

GITLAB_KAS_VERSION

@@ -1 +1 @@
-7e94489bc9d892e3cb25f9f9e7f4f7ce15ac0ee8
+d19af9f22edb454a615b9bb90fdcaa24f72eb488

app/assets/javascripts/admin/application_settings/setup_metrics_and_profiling.js

@@ -2,6 +2,7 @@ import initSetHelperText, {
   initOptionMetricsState,
 } from '~/pages/admin/application_settings/metrics_and_profiling/usage_statistics';
 import PayloadPreviewer from '~/pages/admin/application_settings/payload_previewer';
+import initProductUsageData from '~/pages/admin/application_settings/metrics_and_profiling/product_usage_data';
 
 export default () => {
   Array.from(document.querySelectorAll('.js-payload-preview-trigger')).forEach((trigger) => {
@@ -11,3 +12,4 @@ export default () => {
 
 initSetHelperText();
 initOptionMetricsState();
+initProductUsageData();

app/assets/javascripts/ci/pipeline_details/graph/components/job_group_dropdown.vue

@@ -2,11 +2,13 @@
 import {
   GlBadge,
   GlDisclosureDropdown,
+  GlDisclosureDropdownGroup,
   GlTooltipDirective,
   GlResizeObserverDirective,
 } from '@gitlab/ui';
 import { GlBreakpointInstance } from '@gitlab/ui/dist/utils';
 import JobDropdownItem from '~/ci/common/private/job_dropdown_item.vue';
+import { FAILED_STATUS } from '~/ci/constants';
 import { JOB_DROPDOWN } from '../constants';
 import JobItem from './job_item.vue';
 
@@ -22,6 +24,7 @@ export default {
     JobItem,
     GlBadge,
     GlDisclosureDropdown,
+    GlDisclosureDropdownGroup,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -75,6 +78,15 @@ export default {
     isFailed() {
       return this.group?.status?.group === 'failed';
     },
+    nonFailedJobs() {
+      return this.group?.jobs.filter((job) => job.status?.group !== FAILED_STATUS);
+    },
+    failedJobs() {
+      return this.group?.jobs.filter((job) => job.status?.group === FAILED_STATUS);
+    },
+    hasFailedJobs() {
+      return this.failedJobs.length > 0;
+    },
   },
   methods: {
     handleResize() {
@@ -122,12 +134,26 @@ export default {
       </button>
     </template>
     <ul class="gl-m-0 gl-w-34 gl-overflow-y-auto gl-p-0" @click.stop>
-      <job-dropdown-item
-        v-for="job in group.jobs"
-        :key="job.id"
-        :job="job"
-        @jobActionExecuted="$emit('pipelineActionRequestComplete')"
-      />
+      <gl-disclosure-dropdown-group v-if="hasFailedJobs" data-testid="failed-jobs">
+        <template #group-label>
+          {{ s__('Pipelines|Failed jobs') }}
+        </template>
+        <job-dropdown-item
+          v-for="job in failedJobs"
+          :key="job.id"
+          :job="job"
+          @jobActionExecuted="$emit('pipelineActionRequestComplete')"
+        />
+      </gl-disclosure-dropdown-group>
+
+      <gl-disclosure-dropdown-group :bordered="hasFailedJobs">
+        <job-dropdown-item
+          v-for="job in nonFailedJobs"
+          :key="job.id"
+          :job="job"
+          @jobActionExecuted="$emit('pipelineActionRequestComplete')"
+        />
+      </gl-disclosure-dropdown-group>
     </ul>
   </gl-disclosure-dropdown>
 </template>

app/assets/javascripts/pages/admin/application_settings/metrics_and_profiling/constants.js

@@ -22,4 +22,6 @@ export const ELEMENT_IDS = Object.freeze({
   USAGE_PING_FEATURES_ENABLED: 'application_setting_usage_ping_features_enabled',
   USAGE_PING_ENABLED: 'application_setting_usage_ping_enabled',
   OPTIONAL_METRICS_IN_SERVICE_PING: 'application_setting_include_optional_metrics_in_service_ping',
+  PRODUCT_USAGE_DATA: 'application_setting_gitlab_product_usage_data_enabled',
+  SNOWPLOW_ENABLED: 'application_setting_snowplow_enabled',
 });

app/assets/javascripts/pages/admin/application_settings/metrics_and_profiling/product_usage_data.js

@@ -0,0 +1,33 @@
+import { ELEMENT_IDS } from './constants';
+
+export default function initProductUsageData() {
+  const productUsageCheckbox = document.getElementById(ELEMENT_IDS.PRODUCT_USAGE_DATA);
+  const snowplowCheckbox = document.getElementById(ELEMENT_IDS.SNOWPLOW_ENABLED);
+  const snowplowSettings = document.getElementById('js-snowplow-settings');
+
+  const toggleSnowplowSettings = () => {
+    if (!snowplowCheckbox || !snowplowSettings) return;
+
+    if (snowplowCheckbox.checked) {
+      snowplowSettings.style.display = 'block';
+    } else {
+      snowplowSettings.style.display = 'none';
+    }
+  };
+
+  toggleSnowplowSettings();
+
+  productUsageCheckbox?.addEventListener('change', () => {
+    if (productUsageCheckbox.checked) {
+      snowplowCheckbox.checked = false;
+      toggleSnowplowSettings();
+    }
+  });
+
+  snowplowCheckbox?.addEventListener('change', () => {
+    if (snowplowCheckbox.checked) {
+      productUsageCheckbox.checked = false;
+    }
+    toggleSnowplowSettings();
+  });
+}

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

@@ -340,6 +340,9 @@ export default {
     canSummarizeComments() {
       return this.workItem.userPermissions?.summarizeComments;
     },
+    hasBlockedWorkItemsFeature() {
+      return this.workItem.userPermissions?.blockedWorkItems;
+    },
     isDiscussionLocked() {
       return this.workItemNotes?.discussionLocked;
     },
@@ -1208,6 +1211,7 @@ export default {
               :work-item-type="workItem.workItemType.name"
               :can-admin-work-item-link="canAdminWorkItemLink"
               :active-child-item-id="activeChildItemId"
+              :has-blocked-work-items-feature="hasBlockedWorkItemsFeature"
               @showModal="openContextualView"
             />
 

app/assets/javascripts/work_items/components/work_item_relationships/work_item_add_relationship_form.vue

@@ -52,6 +52,11 @@ export default {
       required: false,
       default: () => [],
     },
+    hasBlockedWorkItemsFeature: {
+      type: Boolean,
+      required: true,
+      default: false,
+    },
   },
   data() {
     return {
@@ -182,22 +187,24 @@ export default {
     <gl-alert v-if="error" variant="danger" class="gl-mb-3" @dismiss="unsetError">
       {{ error }}
     </gl-alert>
-    <gl-form-group
-      :label="linkItemFormHeaderLabel"
-      label-for="linked-item-type-radio"
-      label-class="label-bold"
-      class="gl-mb-3"
-    >
-      <gl-form-radio-group
-        id="linked-item-type-radio"
-        v-model="linkedItemType"
-        :options="linkedItemTypes"
-        :checked="linkedItemType"
-      />
-    </gl-form-group>
-    <p class="gl-mb-2 gl-font-bold">
-      {{ $options.i18n.linkItemInputLabel }}
-    </p>
+    <template v-if="hasBlockedWorkItemsFeature">
+      <gl-form-group
+        :label="linkItemFormHeaderLabel"
+        label-for="linked-item-type-radio"
+        label-class="label-bold"
+        class="gl-mb-3"
+      >
+        <gl-form-radio-group
+          id="linked-item-type-radio"
+          v-model="linkedItemType"
+          :options="linkedItemTypes"
+          :checked="linkedItemType"
+        />
+      </gl-form-group>
+      <p class="gl-mb-2 gl-font-bold">
+        {{ $options.i18n.linkItemInputLabel }}
+      </p>
+    </template>
     <div class="gl-mb-5">
       <work-item-token-input
         v-model="workItemsToAdd"

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

@@ -78,6 +78,11 @@ export default {
       required: false,
       default: null,
     },
+    hasBlockedWorkItemsFeature: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   apollo: {
     linkedWorkItems: {
@@ -146,6 +151,13 @@ export default {
     isEmptyRelatedWorkItems() {
       return !this.error && this.linkedWorkItems.length === 0;
     },
+    emptyStateMessage() {
+      return this.hasBlockedWorkItemsFeature
+        ? s__(
+            "WorkItem|Link items together to show that they're related or that one is blocking others.",
+          )
+        : s__("WorkItem|Link items together to show that they're related.");
+    },
     displayableLinksCount() {
       return this.displayableLinks(this.linkedWorkItems)?.length;
     },
@@ -307,9 +319,6 @@ export default {
   i18n: {
     title: s__('WorkItem|Linked items'),
     fetchError: s__('WorkItem|Something went wrong when fetching items. Please refresh this page.'),
-    emptyStateMessage: s__(
-      "WorkItem|Link items together to show that they're related or that one is blocking others.",
-    ),
     noLinkedItemsOpen: s__('WorkItem|No linked items are currently open.'),
     removeLinkedItemErrorMessage: s__(
       'WorkItem|Something went wrong when removing item. Please refresh this page.',
@@ -371,13 +380,14 @@ export default {
         :work-item-full-path="workItemFullPath"
         :children-ids="childrenIds"
         :work-item-type="workItemType"
+        :has-blocked-work-items-feature="hasBlockedWorkItemsFeature"
         @submitted="hideLinkItemForm"
         @cancel="hideLinkItemForm"
       />
     </template>
 
     <template v-if="isEmptyRelatedWorkItems" #empty>
-      {{ $options.i18n.emptyStateMessage }}
+      {{ emptyStateMessage }}
     </template>
 
     <template #default>

app/assets/stylesheets/page_bundles/pipeline.scss

@@ -223,7 +223,8 @@
   border-color: var(--gl-control-border-color-error);
 }
 
-.ci-job-item-failed {
+.ci-job-component > .ci-job-item-failed,
+.ci-job-component.ci-job-item-failed:not(:hover):not(:focus) > a {
   @apply gl-bg-feedback-danger;
 
   // stylelint-disable-next-line gitlab/no-gl-class

app/components/rapid_diffs/viewers/no_preview_component.html.haml

@@ -6,8 +6,9 @@
     %p.rd-no-preview-paragraph
       = no_preview_reason
   .rd-no-preview-actions
-    - if @diff_file.collapsed? && expandable?
-      = action_button(button_options: { data: { click: 'showChanges' } }) do
+    - if @diff_file.collapsed? && expandable? || @diff_file.whitespace_only?
+      - click = @diff_file.whitespace_only? ? 'showWhitespaceChanges' : 'showChanges'
+      = action_button(button_options: { data: { click: click } }) do
         = _('Show changes')
     - elsif expandable?
       = action_button(button_options: { data: { click: 'showFileContents' } }) do

app/components/rapid_diffs/viewers/no_preview_component.rb

@@ -37,6 +37,8 @@ def no_preview_reason
           _("Preview size limit exceeded, changes collapsed.")
         elsif !@diff_file.diffable?
           _("Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.")
+        elsif @diff_file.whitespace_only?
+          _("Contains only whitespace changes.")
         elsif @diff_file.new_file? || @diff_file.content_changed?
           _("No diff preview for this file type.")
         end

app/controllers/search_controller.rb

@@ -140,7 +140,11 @@ def opensearch; end
   def authenticate?
     return false if action_name == 'opensearch'
     return true if public_visibility_restricted?
-    return true if search_service.global_search? && ::Feature.enabled?(:block_anonymous_global_searches, type: :ops)
+
+    if search_service.global_search? && ::Gitlab::CurrentSettings.global_search_block_anonymous_searches_enabled?
+      return true
+    end
+
     return true if ::Feature.disabled?(:allow_anonymous_searches, type: :ops)
 
     false

app/helpers/application_settings_helper.rb

@@ -74,6 +74,13 @@ def enabled_protocol_button(container, protocol)
 
   def global_search_settings_checkboxes(form)
     [
+      form.gitlab_ui_checkbox_component(
+        :global_search_block_anonymous_searches_enabled,
+        _("Enable blocking of anonymous global search requests"),
+        checkbox_options: {
+          checked: @application_setting.global_search_block_anonymous_searches_enabled, multiple: false
+        }
+      ),
       form.gitlab_ui_checkbox_component(
         :global_search_issues_enabled,
         _("Enable issues tab in global search results"),
@@ -488,6 +495,7 @@ def visible_attributes
       :snowplow_database_collector_hostname,
       :snowplow_enabled,
       :snowplow_app_id,
+      :gitlab_product_usage_data_enabled,
       :push_event_hooks_limit,
       :push_event_activities_limit,
       :custom_http_clone_url_root,

app/models/application_setting.rb

@@ -28,6 +28,8 @@ class ApplicationSetting < ApplicationRecord
     lock_pypi_package_requests_forwarding
   ], remove_with: '18.1', remove_after: '2025-05-20'
 
+  ignore_column :duo_nano_features_enabled, remove_with: '18.1', remove_after: '2025-06-19'
+
   KROKI_URL_ERROR_MESSAGE = 'Please check your Kroki URL setting in ' \
     'Admin area > Settings > General > Kroki'
 
@@ -460,6 +462,8 @@ def self.kroki_formats_attributes
 
   validate :check_valid_runner_registrars
 
+  validate :snowplow_and_product_usage_data_are_mutually_exclusive
+
   validate :terms_exist, if: :enforce_terms?
 
   validates :external_authorization_service_default_label,
@@ -680,7 +684,8 @@ def self.kroki_formats_attributes
   validates :clickhouse, json_schema: { filename: "application_setting_clickhouse" }
 
   jsonb_accessor :service_ping_settings,
-    gitlab_environment_toolkit_instance: [:boolean, { default: false }]
+    gitlab_environment_toolkit_instance: [:boolean, { default: false }],
+    gitlab_product_usage_data_enabled: [:boolean, { default: true }]
 
   jsonb_accessor :rate_limits_unauthenticated_git_http,
     throttle_unauthenticated_git_http_enabled: [:boolean, { default: false }],
@@ -1157,6 +1162,15 @@ def parsed_kroki_url
     )
   end
 
+  def snowplow_and_product_usage_data_are_mutually_exclusive
+    return unless gitlab_product_usage_data_enabled_changed? || snowplow_enabled_changed?
+    return unless snowplow_enabled && gitlab_product_usage_data_enabled
+
+    message = _('Snowplow tracking and Product event tracking cannot be enabled at the same time. ' \
+      'Please disable one of them.')
+    errors.add(:base, message)
+  end
+
   def validate_url(parsed_url, name, error_message)
     return if parsed_url
 

app/models/application_setting_implementation.rb

@@ -103,6 +103,7 @@ def defaults # rubocop:disable Metrics/AbcSize
         gitaly_timeout_default: 55,
         gitaly_timeout_fast: 10,
         gitaly_timeout_medium: 30,
+        gitlab_product_usage_data_enabled: Settings.gitlab['initial_gitlab_product_usage_data'],
         gitpod_enabled: false,
         gitpod_url: 'https://gitpod.io/',
         gravatar_enabled: Settings.gravatar['enabled'],
@@ -593,10 +594,6 @@ def allow_signup?
     signup_enabled? && password_authentication_enabled_for_web?
   end
 
-  def product_usage_data_enabled?
-    true
-  end
-
   def password_authentication_enabled?
     password_authentication_enabled_for_web? || password_authentication_enabled_for_git?
   end

app/models/ci/trigger.rb

@@ -5,6 +5,7 @@ class Trigger < Ci::ApplicationRecord
     include Presentable
     include Limitable
     include Expirable
+    include Gitlab::EncryptedAttribute
 
     TRIGGER_TOKEN_PREFIX = 'glptt-'
 
@@ -26,7 +27,7 @@ class Trigger < Ci::ApplicationRecord
       attribute: :encrypted_token,
       mode: :per_attribute_iv,
       algorithm: 'aes-256-gcm',
-      key: Settings.attr_encrypted_db_key_base_32,
+      key: :db_key_base_32,
       encode: false
 
     before_validation :set_default_values