Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/gitlab/bounded_contexts.yml

@@ -851,7 +851,6 @@ Gitlab/BoundedContexts:
     - 'app/models/concerns/enums/internal_id.rb'
     - 'app/models/concerns/enums/issuable_link.rb'
     - 'app/models/concerns/enums/package_metadata.rb'
-    - 'app/models/concerns/enums/prometheus_metric.rb'
     - 'app/models/concerns/enums/sbom.rb'
     - 'app/models/concerns/enums/vulnerability.rb'
     - 'app/models/concerns/enums/web_ide/extensions_marketplace_opt_in_status.rb'
@@ -1212,7 +1211,6 @@ Gitlab/BoundedContexts:
     - 'app/models/project_statistics.rb'
     - 'app/models/project_team.rb'
     - 'app/models/project_wiki.rb'
-    - 'app/models/prometheus_metric.rb'
     - 'app/models/protectable_dropdown.rb'
     - 'app/models/protected_branch.rb'
     - 'app/models/protected_branch/cache_key.rb'

.rubocop_todo/gitlab/namespaced_class.yml

@@ -268,7 +268,6 @@ Gitlab/NamespacedClass:
     - 'app/models/project_statistics.rb'
     - 'app/models/project_team.rb'
     - 'app/models/project_wiki.rb'
-    - 'app/models/prometheus_metric.rb'
     - 'app/models/protectable_dropdown.rb'
     - 'app/models/protected_branch.rb'
     - 'app/models/protected_tag.rb'

.rubocop_todo/layout/line_length.yml

@@ -268,7 +268,6 @@ Layout/LineLength:
     - 'app/models/concerns/ci/has_status.rb'
     - 'app/models/concerns/each_batch.rb'
     - 'app/models/concerns/enums/ci/pipeline.rb'
-    - 'app/models/concerns/enums/prometheus_metric.rb'
     - 'app/models/concerns/enums/vulnerability.rb'
     - 'app/models/concerns/fast_destroy_all.rb'
     - 'app/models/concerns/group_descendant.rb'
@@ -374,7 +373,6 @@ Layout/LineLength:
     - 'app/models/project_feature.rb'
     - 'app/models/project_statistics.rb'
     - 'app/models/projects/topic.rb'
-    - 'app/models/prometheus_metric.rb'
     - 'app/models/release.rb'
     - 'app/models/releases/link.rb'
     - 'app/models/remote_mirror.rb'
@@ -3844,7 +3842,6 @@ Layout/LineLength:
     - 'spec/models/project_team_spec.rb'
     - 'spec/models/projects/build_artifacts_size_refresh_spec.rb'
     - 'spec/models/projects/triggered_hooks_spec.rb'
-    - 'spec/models/prometheus_metric_spec.rb'
     - 'spec/models/protected_branch_spec.rb'
     - 'spec/models/redirect_route_spec.rb'
     - 'spec/models/release_highlight_spec.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -3721,7 +3721,6 @@ RSpec/FeatureCategory:
     - 'spec/models/projects/project_topic_spec.rb'
     - 'spec/models/projects/topic_spec.rb'
     - 'spec/models/projects/wiki_repository_spec.rb'
-    - 'spec/models/prometheus_metric_spec.rb'
     - 'spec/models/protectable_dropdown_spec.rb'
     - 'spec/models/push_event_payload_spec.rb'
     - 'spec/models/push_event_spec.rb'

.rubocop_todo/rspec/named_subject.yml

@@ -2647,7 +2647,6 @@ RSpec/NamedSubject:
     - 'spec/models/projects/import_export/relation_export_upload_spec.rb'
     - 'spec/models/projects/project_topic_spec.rb'
     - 'spec/models/projects/topic_spec.rb'
-    - 'spec/models/prometheus_metric_spec.rb'
     - 'spec/models/protected_branch_spec.rb'
     - 'spec/models/release_highlight_spec.rb'
     - 'spec/models/releases/source_spec.rb'

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

@@ -110,7 +110,7 @@ export default {
       </div>
     </div>
     <section class="header-main-content gl-mr-3 gl-flex gl-items-center">
-      <ci-icon class="gl-mr-3" :status="status" show-status-text />
+      <ci-icon class="gl-mr-3 gl-leading-1" :status="status" show-status-text />
 
       <template v-if="shouldRenderTriggeredLabel">{{ __('Started') }}</template>
       <template v-else>{{ __('Created') }}</template>

app/assets/javascripts/members/components/members_tabs.vue

@@ -96,6 +96,7 @@ export default {
       :key="tab.namespace"
       :title-link-attributes="tab.attrs"
       :query-param-value="tab.queryParamValue"
+      :lazy="tab.lazy"
     >
       <template #title>
         <span>{{ tab.title }}</span>

app/assets/javascripts/members/placeholders/components/app.vue

@@ -173,6 +173,7 @@ export default {
           :initial-filter-value="initialFilterValue"
           :tokens="filteredSearchTokens"
           :search-input-placeholder="s__('UserMapping|Search placeholder users')"
+          terms-as-tokens
           class="row-content-block gl-grow gl-border-t-0 sm:gl-flex"
           @onFilter="onFilter"
         />
@@ -196,6 +197,7 @@ export default {
           :initial-filter-value="initialFilterValue"
           :tokens="filteredSearchTokens"
           :search-input-placeholder="s__('UserMapping|Search placeholder users')"
+          terms-as-tokens
           class="row-content-block gl-grow gl-border-t-0 sm:gl-flex"
           @onFilter="onFilter"
         />

app/assets/javascripts/members/tabs_metadata.js

@@ -31,5 +31,6 @@ export const TABS = [
     title: s__('UserMapping|Placeholders'),
     queryParamValue: TAB_QUERY_PARAM_VALUES.placeholder,
     component: PlaceholdersTabApp,
+    lazy: true,
   },
 ];

app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue

@@ -15,6 +15,7 @@ import { isScopedLabel } from '~/lib/utils/common_utils';
 import RichTimestampTooltip from '~/vue_shared/components/rich_timestamp_tooltip.vue';
 import WorkItemLinkChildMetadata from 'ee_else_ce/work_items/components/shared/work_item_link_child_metadata.vue';
 import WorkItemTypeIcon from '../work_item_type_icon.vue';
+import WorkItemStateBadge from '../work_item_state_badge.vue';
 import {
   STATE_OPEN,
   WIDGET_TYPE_PROGRESS,
@@ -44,6 +45,7 @@ export default {
     RichTimestampTooltip,
     WorkItemLinkChildMetadata,
     WorkItemTypeIcon,
+    WorkItemStateBadge,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -99,21 +101,18 @@ export default {
     isChildItemOpen() {
       return this.childItem.state === STATE_OPEN;
     },
-    statusIconName() {
-      return this.isChildItemOpen ? 'issue-open-m' : 'issue-close';
-    },
     childItemType() {
       return this.childItem.workItemType.name;
     },
-    statusIconClass() {
-      return this.isChildItemOpen ? 'gl-text-green-500' : 'gl-text-blue-500';
-    },
     stateTimestamp() {
       return this.isChildItemOpen ? this.childItem.createdAt : this.childItem.closedAt;
     },
     stateTimestampTypeText() {
       return this.isChildItemOpen ? this.$options.i18n.created : this.$options.i18n.closed;
     },
+    childItemTypeColorClass() {
+      return this.isChildItemOpen ? 'gl-text-secondary' : 'gl-text-gray-300';
+    },
     hasMetadata() {
       if (this.metadataWidgets) {
         return (
@@ -152,7 +151,7 @@ export default {
     data-testid="links-child"
   >
     <div ref="stateIcon" class="gl-cursor-help">
-      <work-item-type-icon class="gl-text-secondary" :work-item-type="childItemType" />
+      <work-item-type-icon :color-class="childItemTypeColorClass" :work-item-type="childItemType" />
       <gl-tooltip :target="() => $refs.stateIcon">
         {{ childItemType }}
       </gl-tooltip>
@@ -172,6 +171,7 @@ export default {
           </span>
           <gl-link
             :href="childItem.webUrl"
+            :class="{ '!gl-text-secondary': !isChildItemOpen }"
             class="gl-hyphens-auto gl-break-words gl-font-semibold"
             @click.exact="$emit('click', $event)"
             @mouseover="$emit('mouseover')"
@@ -180,7 +180,7 @@ export default {
             {{ childItem.title }}
           </gl-link>
         </div>
-        <div class="gl-flex gl-justify-end">
+        <div class="gl-flex gl-items-center gl-justify-end">
           <gl-avatars-inline
             v-if="assignees.length"
             :avatars="assignees"
@@ -202,11 +202,7 @@ export default {
             class="gl-cursor-help"
             data-testid="item-status-icon"
           >
-            <gl-icon
-              :class="statusIconClass"
-              :name="statusIconName"
-              :aria-label="stateTimestampTypeText"
-            />
+            <work-item-state-badge :work-item-state="childItem.state" :show-icon="false" />
           </span>
           <rich-timestamp-tooltip
             :target="`statusIcon-${childItem.id}`"
@@ -237,7 +233,7 @@ export default {
     <div v-if="canUpdate">
       <gl-button
         v-gl-tooltip
-        class="-gl-mr-2 -gl-mt-2"
+        class="-gl-mr-1 -gl-mt-1"
         category="tertiary"
         size="small"
         icon="close"

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

@@ -262,13 +262,7 @@ export default {
       return this.isWidgetPresent(WIDGET_TYPE_HIERARCHY)?.parent;
     },
     hasParent() {
-      // TODO: This is a temporary check till the issue work item migration is completed
-      // Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/468114
-      const { workItemType, glFeatures, parentWorkItem, hasSubepicsFeature } = this;
-
-      if (workItemType === WORK_ITEM_TYPE_VALUE_TASK) {
-        return glFeatures.namespaceLevelWorkItems && parentWorkItem;
-      }
+      const { workItemType, parentWorkItem, hasSubepicsFeature } = this;
 
       if (workItemType === WORK_ITEM_TYPE_VALUE_EPIC) {
         return hasSubepicsFeature && parentWorkItem;
@@ -277,6 +271,15 @@ export default {
       return Boolean(parentWorkItem);
     },
     shouldShowAncestors() {
+      // TODO: This is a temporary check till the issue work item migration is completed
+      // Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/468114
+      if (
+        this.workItemType === WORK_ITEM_TYPE_VALUE_TASK &&
+        !this.glFeatures.namespaceLevelWorkItems
+      ) {
+        return false;
+      }
+
       // Checks whether current work item has parent
       // or it is in hierarchy but there is no permission to view the parent
       return this.hasParent || this.workItemHierarchy?.hasParent;

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

@@ -12,6 +12,11 @@ export default {
       type: String,
       required: true,
     },
+    showIcon: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
   },
   computed: {
     isWorkItemOpen() {
@@ -21,6 +26,10 @@ export default {
       return this.isWorkItemOpen ? __('Open') : __('Closed');
     },
     workItemStateIcon() {
+      if (!this.showIcon) {
+        return null;
+      }
+
       return this.isWorkItemOpen ? 'issue-open-m' : 'issue-close';
     },
     workItemStateVariant() {

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

@@ -30,6 +30,11 @@ export default {
       required: false,
       default: false,
     },
+    colorClass: {
+      type: String,
+      required: false,
+      default: 'gl-text-secondary',
+    },
   },
   computed: {
     workItemTypeUppercase() {
@@ -63,7 +68,7 @@ export default {
       v-gl-tooltip.hover="showTooltipOnHover"
       :name="iconName"
       :title="workItemTooltipTitle"
-      class="gl-text-secondary"
+      :class="colorClass"
     />
     <span v-if="workItemTypeName" :class="{ 'gl-sr-only': !showText }">{{ workItemTypeName }}</span>
   </span>

app/assets/stylesheets/page_bundles/notes/_system_notes_v2.scss

@@ -96,3 +96,9 @@
     margin-left: $gl-spacing-scale-5;
   }
 }
+
+// Timeline avatars
+
+.timeline-avatar {
+  @apply gl-bg-default;
+}

app/models/concerns/enums/prometheus_metric.rb

@@ -23,10 +23,12 @@ def self.for_oid_and_size(oid, size)
     find_by(oid: oid, size: size)
   end
 
-  def self.not_linked_to_project(project)
+  def self.not_linked_to_project(project, repository_type: nil)
+    linked_to_project = project.lfs_objects_projects.where('lfs_objects_projects.lfs_object_id = lfs_objects.id')
+    linked_to_project = linked_to_project.where(repository_type: repository_type) if repository_type
     where(
       'NOT EXISTS (?)',
-      project.lfs_objects_projects.select(1).where('lfs_objects_projects.lfs_object_id = lfs_objects.id')
+      linked_to_project.select(1)
     )
   end