Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/rspec/example_without_description.yml

@@ -169,7 +169,6 @@ RSpec/ExampleWithoutDescription:
     - 'ee/spec/serializers/ee/group_child_entity_spec.rb'
     - 'ee/spec/services/app_sec/container_scanning/scan_image_service_spec.rb'
     - 'ee/spec/services/ci/create_pipeline_service/compliance_spec.rb'
-    - 'ee/spec/services/ci/pipeline_creation/drop_secrets_provider_not_found_builds_service_spec.rb'
     - 'ee/spec/services/ci/register_job_service_spec.rb'
     - 'ee/spec/services/compliance_management/standards/soc2/at_least_one_non_author_approval_service_spec.rb'
     - 'ee/spec/services/ee/issues/update_service_spec.rb'

app/assets/javascripts/ci/runner/components/runner_delete_button.vue

@@ -33,7 +33,7 @@ export default {
     },
     icon() {
       if (this.compact) {
-        return 'close';
+        return 'remove';
       }
       return '';
     },

app/assets/javascripts/ci/runner/components/runner_delete_disclosure_dropdown_item.vue

@@ -1,6 +1,6 @@
 <script>
 import { GlDisclosureDropdownItem } from '@gitlab/ui';
-import { I18N_DELETE } from '../constants';
+import { I18N_DELETE_RUNNER } from '../constants';
 import RunnerDeleteAction from './runner_delete_action.vue';
 
 export default {
@@ -21,7 +21,7 @@ export default {
       this.$emit('deleted', event);
     },
   },
-  I18N_DELETE,
+  I18N_DELETE_RUNNER,
 };
 </script>
 
@@ -30,7 +30,7 @@ export default {
     <template #default="{ onClick }">
       <gl-disclosure-dropdown-item variant="danger" @action="onClick">
         <template #list-item>
-          {{ $options.I18N_DELETE }}
+          {{ $options.I18N_DELETE_RUNNER }}
         </template>
       </gl-disclosure-dropdown-item>
     </template>

app/assets/javascripts/ci/runner/components/runner_header_actions.vue

@@ -1,10 +1,8 @@
 <script>
-import { GlDisclosureDropdown } from '@gitlab/ui';
-
-import RunnerDeleteButton from './runner_delete_button.vue';
+import { GlDisclosureDropdown, GlTooltipDirective } from '@gitlab/ui';
+import { __ } from '~/locale';
 import RunnerEditButton from './runner_edit_button.vue';
 import RunnerPauseButton from './runner_pause_button.vue';
-
 import RunnerEditDisclosureDropdownItem from './runner_edit_disclosure_dropdown_item.vue';
 import RunnerPauseDisclosureDropdownItem from './runner_pause_disclosure_dropdown_item.vue';
 import RunnerDeleteDisclosureDropdownItem from './runner_delete_disclosure_dropdown_item.vue';
@@ -13,15 +11,15 @@ export default {
   name: 'RunnerHeaderActions',
   components: {
     GlDisclosureDropdown,
-
-    RunnerDeleteButton,
     RunnerEditButton,
     RunnerPauseButton,
-
     RunnerEditDisclosureDropdownItem,
     RunnerPauseDisclosureDropdownItem,
     RunnerDeleteDisclosureDropdownItem,
   },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
   props: {
     runner: {
       type: Object,
@@ -33,42 +31,61 @@ export default {
       default: null,
     },
   },
+  data() {
+    return {
+      isDropdownVisible: false,
+    };
+  },
   computed: {
     canUpdate() {
       return this.runner.userPermissions?.updateRunner;
     },
     canDelete() {
       return this.runner.userPermissions?.deleteRunner;
     },
+    moreActionsTooltip() {
+      return !this.isDropdownVisible ? __('More actions') : '';
+    },
   },
   methods: {
     onDeleted(event) {
       this.$emit('deleted', event);
     },
+    showDropdown() {
+      this.isDropdownVisible = true;
+    },
+    hideDropdown() {
+      this.isDropdownVisible = false;
+    },
   },
 };
 </script>
 
 <template>
   <div v-if="canUpdate || canDelete">
-    <!-- sm and up screens -->
-    <div class="gl-hidden gl-gap-3 sm:gl-flex">
-      <runner-edit-button v-if="canUpdate" :href="editPath" />
-      <runner-pause-button v-if="canUpdate" :runner="runner" />
-      <runner-delete-button v-if="canDelete" :runner="runner" @deleted="onDeleted" />
-    </div>
-
-    <!-- xs screens -->
-    <div class="sm:gl-hidden">
+    <div class="gl-flex gl-gap-3">
+      <runner-edit-button v-if="canUpdate" :href="editPath" class="gl-hidden sm:gl-inline-flex" />
+      <runner-pause-button v-if="canUpdate" :runner="runner" class="gl-hidden sm:gl-inline-flex" />
       <gl-disclosure-dropdown
+        v-gl-tooltip="moreActionsTooltip"
         icon="ellipsis_v"
         :toggle-text="s__('Runner|Runner actions')"
         text-sr-only
         category="tertiary"
         no-caret
+        @shown="showDropdown"
+        @hidden="hideDropdown"
       >
-        <runner-edit-disclosure-dropdown-item v-if="canUpdate" :href="editPath" />
-        <runner-pause-disclosure-dropdown-item v-if="canUpdate" :runner="runner" />
+        <runner-edit-disclosure-dropdown-item
+          v-if="canUpdate"
+          :href="editPath"
+          class="sm:gl-hidden"
+        />
+        <runner-pause-disclosure-dropdown-item
+          v-if="canUpdate"
+          :runner="runner"
+          class="sm:gl-hidden"
+        />
         <runner-delete-disclosure-dropdown-item
           v-if="canDelete"
           :runner="runner"

app/assets/javascripts/ci/runner/constants.js

@@ -70,7 +70,6 @@ export const I18N_PAUSED_DESCRIPTION = s__('Runners|Not accepting jobs');
 export const I18N_RESUME = __('Resume');
 export const I18N_RESUME_TOOLTIP = s__('Runners|Resume accepting jobs');
 
-export const I18N_DELETE = s__('Runners|Delete');
 export const I18N_DELETE_RUNNER = s__('Runners|Delete runner');
 export const I18N_DELETED_TOAST = s__('Runners|Runner %{name} was deleted');
 

app/assets/javascripts/repository/components/header_area/blob_controls.vue

@@ -36,7 +36,7 @@ import userGitpodInfo from '~/repository/queries/user_gitpod_info.query.graphql'
 import applicationInfoQuery from '~/blob/queries/application_info.query.graphql';
 import { getRefType } from '~/repository/utils/ref_type';
 import OpenMrBadge from '~/repository/components/header_area/open_mr_badge.vue';
-import OverflowMenu from 'ee_else_ce/repository/components/header_area/blob_overflow_menu.vue';
+import BlobOverflowMenu from 'ee_else_ce/repository/components/header_area/blob_overflow_menu.vue';
 import ForkSuggestionModal from '~/repository/components/header_area/fork_suggestion_modal.vue';
 import { TEXT_FILE_TYPE, EMPTY_FILE, DEFAULT_BLOB_INFO } from '../../constants';
 
@@ -52,7 +52,7 @@ export default {
   components: {
     OpenMrBadge,
     GlButton,
-    OverflowMenu,
+    BlobOverflowMenu,
     ForkSuggestionModal,
     WebIdeLink: () => import('ee_else_ce/vue_shared/components/web_ide_link.vue'),
   },
@@ -356,7 +356,7 @@ export default {
       @hide="isForkSuggestionModalVisible = false"
     />
 
-    <overflow-menu
+    <blob-overflow-menu
       v-if="!isLoadingRepositoryBlob && glFeatures.blobOverflowMenu"
       :project-path="projectPath"
       :is-binary-file-type="isBinaryFileType"

app/assets/javascripts/repository/components/header_area/blob_overflow_menu.vue

@@ -98,22 +98,14 @@ export default {
   data() {
     return {
       userPermissions: DEFAULT_BLOB_INFO.userPermissions,
+      activeViewerType: SIMPLE_BLOB_VIEWER,
       isLoggedIn: isLoggedIn(),
     };
   },
   computed: {
     isLoading() {
       return this.$apollo?.queries.projectInfo.loading;
     },
-    activeViewerType() {
-      if (this.$route?.query?.plain !== '1') {
-        const richViewer = document.querySelector('.blob-viewer[data-type="rich"]');
-        if (richViewer) {
-          return RICH_BLOB_VIEWER;
-        }
-      }
-      return SIMPLE_BLOB_VIEWER;
-    },
     viewer() {
       return this.activeViewerType === RICH_BLOB_VIEWER
         ? this.blobInfo.richViewer
@@ -132,7 +124,27 @@ export default {
       return this.eeIsLocked !== undefined ? this.eeIsLocked : false;
     },
   },
+  watch: {
+    // Watch the URL 'plain' query value to know if the viewer needs changing.
+    // This is the case when the user switches the viewer and then goes back through the history
+    '$route.query.plain': {
+      handler(plainValue) {
+        this.updateViewerFromQueryParam(plainValue);
+      },
+    },
+  },
+  mounted() {
+    this.updateViewerFromQueryParam(this.$route?.query?.plain);
+  },
   methods: {
+    updateViewerFromQueryParam(plainValue) {
+      const hasRichViewer = Boolean(this.blobInfo.richViewer);
+      const useSimpleViewer = plainValue === '1' || !hasRichViewer;
+      this.switchViewer(useSimpleViewer ? SIMPLE_BLOB_VIEWER : RICH_BLOB_VIEWER);
+    },
+    switchViewer(newViewer) {
+      this.activeViewerType = newViewer || SIMPLE_BLOB_VIEWER;
+    },
     onCopy() {
       if (this.overrideCopy) {
         this.$emit('copy');

app/graphql/types/group_invitation_type.rb

@@ -5,7 +5,7 @@ class GroupInvitationType < BaseObject
     graphql_name 'GroupInvitation'
     description 'Represents a Group Invitation'
 
-    expose_permissions Types::PermissionTypes::Group
+    expose_permissions Types::PermissionTypes::Members::GroupMember
     authorize :admin_group
 
     implements InvitationInterface

app/graphql/types/group_member_type.rb

@@ -5,7 +5,7 @@ class GroupMemberType < BaseObject
     graphql_name 'GroupMember'
     description 'Represents a Group Membership'
 
-    expose_permissions Types::PermissionTypes::Group
+    expose_permissions Types::PermissionTypes::Members::GroupMember
     authorize :read_group
 
     implements MemberInterface

app/graphql/types/permission_types/group.rb

@@ -6,6 +6,14 @@ class Group < BasePermissionType
       graphql_name 'GroupPermissions'
 
       abilities :read_group, :create_projects, :create_custom_emoji, :remove_group, :view_edit_page
+      permission_field :can_leave,
+        description: 'If `true`, the user can leave this group.'
+
+      def can_leave
+        return false unless current_user
+
+        current_user.can_leave_group?(object)
+      end
     end
   end
 end

app/graphql/types/permission_types/members/group_member.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Types
+  module PermissionTypes
+    module Members
+      class GroupMember < BasePermissionType
+        graphql_name 'GroupMemberPermissions'
+
+        abilities :read_group, :create_projects, :create_custom_emoji, :remove_group, :view_edit_page
+      end
+    end
+  end
+end

app/models/user.rb

@@ -1569,6 +1569,10 @@ def can_create_group?
     can?(:create_group)
   end
 
+  def can_leave_group?(group)
+    can?(:destroy_group_member, group.member(self))
+  end
+
   def can_select_namespace?
     several_namespaces? || admin
   end

app/workers/concerns/application_worker.rb

@@ -20,6 +20,7 @@ module ApplicationWorker
     prefer_calling_context_feature_category false
     set_queue
     after_set_class_attribute { set_queue }
+    set_default_concurrency_limit
 
     def structured_payload(payload = {})
       context = Gitlab::ApplicationContext.current.merge(
@@ -251,5 +252,9 @@ def process_schedule_at_for_batch(schedule_at, index)
 
       schedule_at
     end
+
+    def set_default_concurrency_limit
+      concurrency_limit -> { 0 }
+    end
   end
 end

config/application_setting_columns/duo_nano_features_enabled.yml

@@ -0,0 +1,9 @@
+---
+name: track_sidekiq_concurrency_limit_execution
+feature_issue_url: https://gitlab.com/gitlab-com/gl-infra/data-access/durability/team/-/issues/135
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/188415
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/527022
+milestone: '18.0'
+group: group::durability
+type: gitlab_com_derisk
+default_enabled: false

config/feature_flags/gitlab_com_derisk/track_sidekiq_concurrency_limit_execution.yml

@@ -63,13 +63,13 @@ def self.enabled?
   # This also increases the internal redis pool from 10 to concurrency+5.
   config.redis = queues_config_hash.merge({ size: config.concurrency + 5 })
 
-  config.server_middleware(&Gitlab::SidekiqMiddleware.server_configurator(
+  config.server_middleware(&Gitlab::SidekiqMiddleware::Server.configurator(
     metrics: Settings.monitoring.sidekiq_exporter,
     arguments_logger: SidekiqLogArguments.enabled? && !enable_json_logs,
     skip_jobs: Gitlab::Utils.to_boolean(ENV['SIDEKIQ_SKIP_JOBS'], default: true)
   ))
 
-  config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator)
+  config.client_middleware(&Gitlab::SidekiqMiddleware::Client.configurator)
 
   config.death_handlers << Gitlab::SidekiqDeathHandler.method(:handler)
 
@@ -125,7 +125,7 @@ def self.enabled?
   config.logger = Gitlab::SidekiqLogging::ClientLogger.build
   config.logger.formatter = Gitlab::SidekiqLogging::JSONFormatter.new if enable_json_logs
 
-  config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator)
+  config.client_middleware(&Gitlab::SidekiqMiddleware::Client.configurator)
 end
 
 Gitlab::Application.configure do |config|

config/initializers/sidekiq.rb

@@ -5,4 +5,4 @@ feature_category: continuous_integration
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/175399
 milestone: '17.9'
 queued_migration_version: 20250113064942
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20250416232335'

db/docs/batched_background_migrations/backfill_p_ci_pipeline_variables_from_ci_trigger_requests.yml

@@ -5,4 +5,4 @@ feature_category: web_ide
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/178090
 milestone: '17.10'
 queued_migration_version: 20250115162840
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: 20250403053604

db/docs/batched_background_migrations/backfill_vs_code_settings_settings_context_hash.yml

@@ -8,15 +8,5 @@ description: Routing table for ci_build_trace_metadata
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/162310
 milestone: '14.2'
 gitlab_schema: gitlab_ci
-desired_sharding_key:
-  project_id:
-    references: projects
-    backfill_via:
-      parent:
-        foreign_key: build_id
-        table: p_ci_builds
-        sharding_key: project_id
-        belongs_to: build
-        foreign_key_name: fk_rails_aebc78111f_p
-desired_sharding_key_migration_job_name: BackfillCiBuildTraceMetadataProjectId
+sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/526991
 table_size: small