Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/style/inline_disable_annotation.yml

@@ -1493,7 +1493,6 @@ Style/InlineDisableAnnotation:
     - 'ee/app/services/vulnerabilities/bulk_dismiss_service.rb'
     - 'ee/app/services/vulnerabilities/create_service_base.rb'
     - 'ee/app/services/vulnerabilities/manually_create_service.rb'
-    - 'ee/app/services/work_items/widgets/iteration_service/base_service.rb'
     - 'ee/app/validators/user_existence_validator.rb'
     - 'ee/app/validators/user_id_existence_validator.rb'
     - 'ee/app/workers/active_user_count_threshold_worker.rb'

GITLAB_PAGES_VERSION

@@ -1 +1 @@
-32916bff1cffbe5287550db0b960f6b4e47addfe
+2927579d8258f68547428f33ab6c898045e74a82

Gemfile

@@ -617,7 +617,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'gitaly', '~> 17.2.0', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
-gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management
+gem 'kas-grpc', '~> 0.6.0', feature_category: :deployment_management
 
 gem 'grpc', '~> 1.63', feature_category: :shared
 

Gemfile.checksum

@@ -279,15 +279,15 @@
 {"name":"graphql","version":"2.3.5","platform":"ruby","checksum":"9c367835f86541660d24c3d81632267ecee553d304577aaee070f8ac05860af1"},
 {"name":"graphql-client","version":"0.23.0","platform":"ruby","checksum":"f238b8e451676baad06bd15f95396e018192243dcf12c4e6d13fb41d9a2babc1"},
 {"name":"graphql-docs","version":"5.0.0","platform":"ruby","checksum":"76baca6e5a803a4b6a9fbbbfdbf16742b7c4c546c8592b6e1a7aa4e79e562d04"},
-{"name":"grpc","version":"1.63.0","platform":"aarch64-linux","checksum":"dc75c5fd570b819470781d9512105dddfdd11d984f38b8e60bb946f92d1f79ee"},
-{"name":"grpc","version":"1.63.0","platform":"arm64-darwin","checksum":"91b93a354508a9d1772f095554f2e4c04358c2b32d7a670e3705b7fc4695c996"},
-{"name":"grpc","version":"1.63.0","platform":"ruby","checksum":"5f4383c4ee2886e92c31b90422261b7527f26e3baa585d877e9804e715983686"},
-{"name":"grpc","version":"1.63.0","platform":"x64-mingw-ucrt","checksum":"bbca63f19b45cca5a485f5c5eb363a8684d23a6d0c3421bde5e72e6227291488"},
-{"name":"grpc","version":"1.63.0","platform":"x64-mingw32","checksum":"fb6251f497c8327eda92c4af293ec07fcaec4ffaa2514d3942a7c31406bfaf5b"},
-{"name":"grpc","version":"1.63.0","platform":"x86-linux","checksum":"152140fa2c28e384d3c1ded454a66d5e22fb2ff1d2920c2ef2530b2d707de6fd"},
-{"name":"grpc","version":"1.63.0","platform":"x86-mingw32","checksum":"eed13225b08e705421fef9d986de6c2310ec692df1d80f7a4d407de7c1f98525"},
-{"name":"grpc","version":"1.63.0","platform":"x86_64-darwin","checksum":"a814414ff178e89ee3ad0cc2a826ce1ca96c68063effb81affe3e5ceff7b44cc"},
-{"name":"grpc","version":"1.63.0","platform":"x86_64-linux","checksum":"41a90a597f44959c8dbb94619db2b0c0939a768569a5dfad41fffa227eb1287d"},
+{"name":"grpc","version":"1.65.2","platform":"aarch64-linux","checksum":"a541d5aeb721ac5e732284ca8b6b955b2e2e5135c3c23134b926a569eca68933"},
+{"name":"grpc","version":"1.65.2","platform":"arm64-darwin","checksum":"1a7e762ae1b59c363f26dfbbd857a87bf8f806744438a1a85d828e92d57ba436"},
+{"name":"grpc","version":"1.65.2","platform":"ruby","checksum":"9d696e4e742eb1a7f3b3b7a6b3ee1796e4a6a2b009513b5f048df50e823622cc"},
+{"name":"grpc","version":"1.65.2","platform":"x64-mingw-ucrt","checksum":"b3341bfa6050b1e1790fcfa5560bc9b0d82ffe36d7bacfccb5c621401424198d"},
+{"name":"grpc","version":"1.65.2","platform":"x64-mingw32","checksum":"ea5162774967da44606552d3ca0c8efb3769c6a7b094e0764c38edca5ecab3e5"},
+{"name":"grpc","version":"1.65.2","platform":"x86-linux","checksum":"d7566459acb8964aff730f3c662e31122fca148befd76598fa11ea80efe8a892"},
+{"name":"grpc","version":"1.65.2","platform":"x86-mingw32","checksum":"6c102550453269f1de35cedc001aee1315bfec7af862008a8232c3262dcf130d"},
+{"name":"grpc","version":"1.65.2","platform":"x86_64-darwin","checksum":"4693e166dc84270f16e6b71d8f758cbbd367070f1d980d590d97e8b4b9b8d6ff"},
+{"name":"grpc","version":"1.65.2","platform":"x86_64-linux","checksum":"229bd96065637e867a2c13a1c5edb34ebdd14d2250428f03df718fd7a541edb5"},
 {"name":"grpc-google-iam-v1","version":"1.5.0","platform":"ruby","checksum":"cea356d150dac69751f6a4c71f1571c8022c69d9f4ce9c18139200932c19374e"},
 {"name":"gssapi","version":"1.3.1","platform":"ruby","checksum":"c51cf30842ee39bd93ce7fc33e20405ff8a04cda9dec6092071b61258284aee1"},
 {"name":"guard","version":"2.16.2","platform":"ruby","checksum":"71ba7abaddecc8be91ab77bbaf78f767246603652ebbc7b976fda497ebdc8fbb"},
@@ -341,7 +341,7 @@
 {"name":"kaminari-actionview","version":"1.2.2","platform":"ruby","checksum":"1330f6fc8b59a4a4ef6a549ff8a224797289ebf7a3a503e8c1652535287cc909"},
 {"name":"kaminari-activerecord","version":"1.2.2","platform":"ruby","checksum":"0dd3a67bab356a356f36b3b7236bcb81cef313095365befe8e98057dd2472430"},
 {"name":"kaminari-core","version":"1.2.2","platform":"ruby","checksum":"3bd26fec7370645af40ca73b9426a448d09b8a8ba7afa9ba3c3e0d39cdbb83ff"},
-{"name":"kas-grpc","version":"0.5.0","platform":"ruby","checksum":"6c796f5afb1f1f37ae7a9d958d9f4b0ba46249e0dd4ca6ee268d4210b85dce35"},
+{"name":"kas-grpc","version":"0.6.0","platform":"ruby","checksum":"43f7364cf45d50d5696ca4e1689bb648f22e5cec70fcf8ffe58330c04455af79"},
 {"name":"knapsack","version":"4.0.0","platform":"ruby","checksum":"a9422688751989d09a40b4bf7f959a71a3bfe7bc49d3cd610c2fcfb6e45482b8"},
 {"name":"kramdown","version":"2.3.2","platform":"ruby","checksum":"cb4530c2e9d16481591df2c9336723683c354e5416a5dd3e447fa48215a6a71c"},
 {"name":"kramdown-parser-gfm","version":"1.1.0","platform":"ruby","checksum":"fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729"},

Gemfile.lock

@@ -898,8 +898,8 @@ GEM
       graphql (~> 2.0)
       html-pipeline (~> 2.14, >= 2.14.3)
       sass-embedded (~> 1.58)
-    grpc (1.63.0)
-      google-protobuf (~> 3.25)
+    grpc (1.65.2)
+      google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (1.5.0)
       google-protobuf (~> 3.18)
@@ -1020,7 +1020,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    kas-grpc (0.5.0)
+    kas-grpc (0.6.0)
       grpc (~> 1.0)
     knapsack (4.0.0)
       rake
@@ -2107,7 +2107,7 @@ DEPENDENCIES
   jsonb_accessor (~> 1.3.10)
   jwt (~> 2.5)
   kaminari (~> 1.2.2)
-  kas-grpc (~> 0.5.0)
+  kas-grpc (~> 0.6.0)
   knapsack (~> 4.0.0)
   kramdown (~> 2.3.1)
   kubeclient (~> 4.11.0)

app/assets/javascripts/environments/environment_details/components/kubernetes/delete_pod_modal.vue

@@ -21,6 +21,14 @@ export default {
       required: true,
       type: Object,
     },
+    agentId: {
+      required: true,
+      type: String,
+    },
+    environmentId: {
+      required: true,
+      type: String,
+    },
   },
   data() {
     return {
@@ -112,6 +120,9 @@ export default {
         variant="danger"
         category="primary"
         data-testid="delete-pod-button"
+        data-event-tracking="click_delete_pod"
+        :data-event-label="agentId"
+        :data-event-property="environmentId"
         @click="deletePod"
         >{{ $options.i18n.buttonPrimary }}
       </gl-button>

app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue

@@ -46,6 +46,10 @@ export default {
       type: String,
       required: true,
     },
+    environmentId: {
+      type: String,
+      required: true,
+    },
     clusterAgent: {
       type: Object,
       required: false,
@@ -249,6 +253,8 @@ export default {
     <delete-pod-modal
       :pod="podToDelete"
       :configuration="k8sAccessConfiguration"
+      :agent-id="gitlabAgentId"
+      :environment-id="environmentId"
       @close="onCloseModal"
     />
 

app/assets/javascripts/environments/environment_details/index.vue

@@ -3,6 +3,7 @@
 import { GlLoadingIcon, GlTabs, GlTab, GlBadge } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import { getParameterValues, setUrlParams, updateHistory } from '~/lib/utils/url_utility';
+import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import environmentClusterAgentQuery from '~/environments/graphql/queries/environment_cluster_agent.query.graphql';
 import DeploymentHistory from './components/deployment_history.vue';
 import KubernetesOverview from './components/kubernetes/kubernetes_overview.vue';
@@ -68,6 +69,10 @@ export default {
     fluxResourcePath() {
       return this.environment?.fluxResourcePath || '';
     },
+    environmentId() {
+      const idFromGraphQlId = getIdFromGraphQLId(this.environment.id);
+      return idFromGraphQlId ? idFromGraphQlId.toString() : this.environment.id;
+    },
   },
   i18n: {
     deploymentHistory: s__('Environments|Deployment history'),
@@ -108,6 +113,7 @@ export default {
     >
       <kubernetes-overview
         :environment-name="environmentName"
+        :environment-id="environmentId"
         :cluster-agent="environment.clusterAgent"
         :kubernetes-namespace="kubernetesNamespace"
         :flux-resource-path="fluxResourcePath"

app/assets/javascripts/graphql_shared/possible_types.json

@@ -116,7 +116,8 @@
     "ConanMetadata",
     "MavenMetadata",
     "NugetMetadata",
-    "PypiMetadata"
+    "PypiMetadata",
+    "TerraformModuleMetadata"
   ],
   "Registrable": [
     "CiSecureFileRegistry",
@@ -148,6 +149,11 @@
     "BaseService",
     "JiraService"
   ],
+  "TerraformModuleMetadataSharedFields": [
+    "TerraformModuleMetadataExample",
+    "TerraformModuleMetadataRoot",
+    "TerraformModuleMetadataSubmodule"
+  ],
   "TimeboxReportInterface": [
     "Iteration",
     "Milestone"

app/assets/javascripts/issues/list/constants.js

@@ -230,6 +230,7 @@ export const filtersMap = {
       },
       [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[assignee_username][]',
+        [ALTERNATIVE_FILTER]: 'not[assignee_username]',
       },
       [OPERATOR_OR]: {
         [NORMAL_FILTER]: 'or[assignee_username][]',

app/assets/javascripts/labels/label_manager.js

@@ -14,7 +14,6 @@ export default class LabelManager {
     this.otherLabels = otherLabels || $('.js-other-labels');
     this.errorMessage = __('Unable to update label prioritization at this time');
     this.emptyState = document.querySelector('#js-priority-labels-empty-state');
-    this.$badgeItemTemplate = $('#js-badge-item-template');
 
     if ('sortable' in this.prioritizedLabels.data()) {
       Sortable.create(this.prioritizedLabels.get(0), {
@@ -66,8 +65,6 @@ export default class LabelManager {
     }
 
     const $detachedLabel = $label.detach();
-    this.toggleLabelPriorityBadge($detachedLabel, action);
-
     const $labelEls = $target.find('.js-label-list-item');
 
     /*
@@ -102,14 +99,6 @@ export default class LabelManager {
     }
   }
 
-  toggleLabelPriorityBadge($label, action) {
-    if (action === 'remove') {
-      $('.js-priority-badge', $label).remove();
-    } else {
-      $('.label-links', $label).prepend(this.$badgeItemTemplate.clone().html());
-    }
-  }
-
   onPrioritySortUpdate() {
     this.savePrioritySort().catch(() =>
       createAlert({

app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue

@@ -192,7 +192,7 @@ export default {
           icon: 'user',
           token: UserToken,
           dataType: 'user',
-          operators: OPERATORS_IS,
+          operators: OPERATORS_IS_NOT,
           fullPath: this.fullPath,
           isProject: true,
           recentSuggestionsStorageKey: `${this.fullPath}-merge-requests-recent-tokens-assignee`,

app/assets/javascripts/merge_requests/list/queries/get_merge_requests.query.graphql

@@ -18,6 +18,7 @@ query getMergeRequests(
   $milestoneWildcardId: MilestoneWildcardId
   $sourceBranches: [String!]
   $targetBranches: [String!]
+  $not: MergeRequestsResolverNegatedParams
   $beforeCursor: String
   $afterCursor: String
   $firstPageSize: Int
@@ -39,6 +40,7 @@ query getMergeRequests(
       milestoneWildcardId: $milestoneWildcardId
       sourceBranches: $sourceBranches
       targetBranches: $targetBranches
+      not: $not
       before: $beforeCursor
       after: $afterCursor
       first: $firstPageSize

app/assets/javascripts/merge_requests/list/queries/get_merge_requests_counts.query.graphql

@@ -4,6 +4,7 @@ query getMergeRequestsCount(
   $assigneeUsernames: String
   $milestoneTitle: String
   $milestoneWildcardId: MilestoneWildcardId
+  $not: MergeRequestsResolverNegatedParams
 ) {
   project(fullPath: $fullPath) {
     id
@@ -13,6 +14,7 @@ query getMergeRequestsCount(
       assigneeWildcardId: $assigneeWildcardId
       milestoneTitle: $milestoneTitle
       milestoneWildcardId: $milestoneWildcardId
+      not: $not
     ) {
       count
     }
@@ -22,6 +24,7 @@ query getMergeRequestsCount(
       assigneeWildcardId: $assigneeWildcardId
       milestoneTitle: $milestoneTitle
       milestoneWildcardId: $milestoneWildcardId
+      not: $not
     ) {
       count
     }
@@ -31,6 +34,7 @@ query getMergeRequestsCount(
       assigneeWildcardId: $assigneeWildcardId
       milestoneTitle: $milestoneTitle
       milestoneWildcardId: $milestoneWildcardId
+      not: $not
     ) {
       count
     }
@@ -40,6 +44,7 @@ query getMergeRequestsCount(
       assigneeWildcardId: $assigneeWildcardId
       milestoneTitle: $milestoneTitle
       milestoneWildcardId: $milestoneWildcardId
+      not: $not
     ) {
       count
     }

app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/details_header.vue

@@ -4,13 +4,15 @@ import {
   GlDisclosureDropdownItem,
   GlIcon,
   GlTooltipDirective,
+  GlBadge,
 } from '@gitlab/ui';
 import { sprintf, n__, s__ } from '~/locale';
 import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue';
 import TitleArea from '~/vue_shared/components/registry/title_area.vue';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
 import { formatDate } from '~/lib/utils/datetime_utility';
 import { numberToHumanSize } from '~/lib/utils/number_utils';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import {
   CREATED_AT,
   LAST_PUBLISHED_AT,
@@ -31,17 +33,23 @@ import {
   ONGOING_STATUS,
   ROOT_IMAGE_TOOLTIP,
 } from '../../constants/index';
-
 import getContainerRepositoryMetadata from '../../graphql/queries/get_container_repository_metadata.query.graphql';
 import { getImageName } from '../../utils';
 
 export default {
   name: 'DetailsHeader',
-  components: { GlDisclosureDropdown, GlDisclosureDropdownItem, GlIcon, TitleArea, MetadataItem },
+  components: {
+    GlDisclosureDropdown,
+    GlDisclosureDropdownItem,
+    GlIcon,
+    TitleArea,
+    MetadataItem,
+    GlBadge,
+  },
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  mixins: [timeagoMixin],
+  mixins: [timeagoMixin, glFeatureFlagsMixin()],
   inject: ['config'],
   props: {
     image: {
@@ -128,6 +136,12 @@ export default {
       const { size } = this.imageDetails;
       return size ? numberToHumanSize(Number(size)) : null;
     },
+    showBadgeProtected() {
+      return (
+        Boolean(this.glFeatures.containerRegistryProtectedContainers) &&
+        Boolean(this.image?.protectionRuleExists)
+      );
+    },
   },
   methods: {
     formatDate(date) {
@@ -137,6 +151,9 @@ export default {
   i18n: {
     DELETE_IMAGE_TEXT,
     MORE_ACTIONS_TEXT,
+    BADGE_PROTECTED_TOOLTIP_TEXT: s__(
+      'ContainerRegistry|A protection rule exists for this container repository.',
+    ),
   },
 };
 </script>
@@ -187,6 +204,7 @@ export default {
         data-testid="created-and-visibility"
       />
     </template>
+
     <template v-if="containsLastPublishedAtDate" #metadata-last-published-at>
       <metadata-item
         icon="calendar"
@@ -195,6 +213,19 @@ export default {
         data-testid="last-published-at"
       />
     </template>
+
+    <template #metadata-protection-rule-exists>
+      <gl-badge
+        v-if="showBadgeProtected"
+        v-gl-tooltip="{ title: $options.i18n.BADGE_PROTECTED_TOOLTIP_TEXT }"
+        icon-size="sm"
+        size="sm"
+        variant="neutral"
+      >
+        {{ __('protected') }}
+      </gl-badge>
+    </template>
+
     <template v-if="!deleteButtonDisabled" #right-actions>
       <gl-disclosure-dropdown
         category="tertiary"

app/assets/javascripts/packages_and_registries/container_registry/explorer/graphql/queries/get_container_repository_details.query.graphql

@@ -8,6 +8,7 @@ query getContainerRepositoryDetails($id: ContainerRepositoryID!) {
     createdAt
     expirationPolicyStartedAt
     expirationPolicyCleanupStatus
+    protectionRuleExists
     project {
       id
       visibility

app/assets/javascripts/packages_and_registries/container_registry/explorer/graphql/queries/get_container_repository_metadata.query.graphql

@@ -7,5 +7,6 @@ query getContainerRepositoryMetadata(
     tagsCount
     size @include(if: $metadataDatabaseEnabled)
     lastPublishedAt @include(if: $metadataDatabaseEnabled)
+    protectionRuleExists
   }
 }