Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/admin/abuse_reports/constants.js

@@ -125,7 +125,7 @@ export const ABUSE_CATEGORIES = {
   },
   other: {
     backgroundColor: '#dcdcde',
-    textColor: 'gl-text-gray-700',
+    textColor: 'gl-text-subtle',
     title: s__('AbuseReport|Other'),
   },
 };

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

@@ -31,7 +31,7 @@ export default {
           };
         case JOB_STATUS_IDLE:
           return {
-            classes: '!gl-text-gray-700 gl-shadow-inner-1-gray-400 !gl-border-gray-500',
+            classes: '!gl-text-subtle gl-shadow-inner-1-gray-400 !gl-border-gray-500',
             label: I18N_JOB_STATUS_IDLE,
           };
         default:

app/assets/javascripts/projects/pipelines/charts/components/pipeline_duration_chart.vue

@@ -1,5 +1,6 @@
 <script>
 import { GlLoadingIcon } from '@gitlab/ui';
+import { engineeringNotation } from '@gitlab/ui/src/utils/number_utils';
 import { GlLineChart } from '@gitlab/ui/dist/charts';
 import { s__ } from '~/locale';
 import { stringifyTime, parseSeconds } from '~/lib/utils/datetime/date_format_utility';
@@ -50,7 +51,18 @@ export default {
   },
   lineChartOptions: {
     yAxis: {
-      name: s__('Pipeline|Seconds'),
+      name: s__('Pipeline|Minutes'),
+      type: 'value',
+      axisLabel: {
+        formatter: (seconds) => {
+          const minutes = seconds / 60;
+          // using engineering notation for small amounts is strange, as we'd render "milliminutes"
+          if (minutes < 1) {
+            return minutes.toFixed(2).replace(/\.?0*$/, '');
+          }
+          return engineeringNotation(minutes, 2);
+        },
+      },
     },
     xAxis: {
       name: s__('Pipeline|Time'),

app/assets/javascripts/projects/pipelines/charts/components/pipeline_status_chart.vue

@@ -72,7 +72,7 @@ export default {
       v-else
       x-axis-type="category"
       :x-axis-title="s__('Pipelines|Time')"
-      :y-axis-title="s__('Pipelines|Pipelines count')"
+      :y-axis-title="s__('Pipelines|Number of Pipelines')"
       :custom-palette="$options.palette"
       :group-by="groupBy"
       :bars="bars"

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

@@ -241,7 +241,7 @@ export default {
           opened
           aria-hidden="true"
           class="gl-mr-3 gl-inline-flex"
-          :class="{ 'gl-text-gray-700': isTreeView }"
+          :class="{ 'gl-text-subtle': isTreeView }"
         />{{ directoryName }}
       </h1>
 

app/assets/javascripts/vue_merge_request_widget/components/widget/utils.js

@@ -30,9 +30,9 @@ const textStyleTags = {
   [getStartTag('success')]: '<span class="gl-font-bold gl-text-success">',
   [getStartTag('danger')]: '<span class="gl-font-bold gl-text-danger">',
   [getStartTag('critical')]: '<span class="gl-font-bold gl-text-red-800">',
-  [getStartTag('same')]: '<span class="gl-font-bold gl-text-gray-700">',
+  [getStartTag('same')]: '<span class="gl-font-bold gl-text-subtle">',
   [getStartTag('strong')]: '<span class="gl-font-bold">',
-  [getStartTag('small')]: '<span class="gl-text-sm gl-text-gray-700">',
+  [getStartTag('small')]: '<span class="gl-text-sm gl-text-subtle">',
 };
 
 const escapeText = (text) =>

app/assets/javascripts/vue_shared/components/commit.vue

@@ -167,20 +167,20 @@ export default {
           <gl-link
             v-if="mergeRequestRef"
             :href="mergeRequestRef.path"
-            class="gl-text-gray-700"
+            class="gl-text-subtle"
             data-testid="ref-name"
           >
             {{ mergeRequestRef.iid }}
           </gl-link>
-          <gl-link v-else :href="refUrl" class="gl-text-gray-700" data-testid="ref-name">
+          <gl-link v-else :href="refUrl" class="gl-text-subtle" data-testid="ref-name">
             {{ commitRef.name }}
           </gl-link>
         </tooltip-on-truncate>
       </div>
 
       <div class="gl-inline-block gl-rounded-base gl-bg-strong gl-px-2 gl-text-sm gl-text-default">
         <gl-icon name="commit" class="js-commit-icon" :size="12" />
-        <gl-link :href="commitUrl" class="gl-text-gray-700" data-testid="commit-sha">{{
+        <gl-link :href="commitUrl" class="gl-text-subtle" data-testid="commit-sha">{{
           shortSha
         }}</gl-link>
       </div>

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

@@ -107,11 +107,6 @@ export default {
       required: false,
       default: () => ({}),
     },
-    noResetButton: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
   },
   data() {
     return {
@@ -128,7 +123,7 @@ export default {
       return `work-item-dropdown-listbox-value-${this.dropdownName}`;
     },
     resetButton() {
-      return this.noResetButton ? null : this.resetButtonLabel || __('Clear');
+      return this.resetButtonLabel || __('Clear');
     },
     toggleText() {
       return !this.toggleDropdownText && !this.hasValue

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

@@ -13,7 +13,6 @@ import {
   WIDGET_TYPE_ITERATION,
   WIDGET_TYPE_LABELS,
   WIDGET_TYPE_MILESTONE,
-  WIDGET_TYPE_STATUS,
   WIDGET_TYPE_PARTICIPANTS,
   WIDGET_TYPE_PROGRESS,
   WIDGET_TYPE_START_AND_DUE_DATE,
@@ -55,7 +54,6 @@ export default {
     WorkItemColor: () => import('ee_component/work_items/components/work_item_color.vue'),
     WorkItemCustomFields: () =>
       import('ee_component/work_items/components/work_item_custom_fields.vue'),
-    WorkItemStatus: () => import('ee_component/work_items/components/work_item_status.vue'),
   },
   mixins: [glFeatureFlagMixin()],
   inject: ['hasSubepicsFeature'],
@@ -185,9 +183,6 @@ export default {
     workItemColor() {
       return this.isWidgetPresent(WIDGET_TYPE_COLOR);
     },
-    workItemStatus() {
-      return this.isWidgetPresent(WIDGET_TYPE_STATUS);
-    },
     workItemAuthor() {
       return this.workItem?.author;
     },
@@ -203,9 +198,6 @@ export default {
     showWorkItemCustomFields() {
       return this.glFeatures.customFieldsFeature && this.customFields;
     },
-    showWorkItemStatus() {
-      return this.glFeatures.workItemStatusFeatureFlag;
-    },
   },
   methods: {
     isWidgetPresent(type, workItem = this.workItem) {
@@ -217,16 +209,6 @@ export default {
 
 <template>
   <div class="work-item-attributes-wrapper">
-    <work-item-status
-      v-if="showWorkItemStatus"
-      class="work-item-attributes-item"
-      :can-update="canUpdateMetadata"
-      :work-item-id="workItem.id"
-      :work-item-iid="workItem.iid"
-      :work-item-type="workItemType"
-      :full-path="fullPath"
-      @error="$emit('error', $event)"
-    />
     <work-item-assignees
       v-if="workItemAssignees"
       class="js-assignee work-item-attributes-item"

app/assets/javascripts/work_items/constants.js

@@ -24,7 +24,6 @@ export const WIDGET_TYPE_PROGRESS = 'PROGRESS';
 export const WIDGET_TYPE_HIERARCHY = 'HIERARCHY';
 export const WIDGET_TYPE_MILESTONE = 'MILESTONE';
 export const WIDGET_TYPE_ITERATION = 'ITERATION';
-export const WIDGET_TYPE_STATUS = 'STATUS';
 export const WIDGET_TYPE_NOTES = 'NOTES';
 export const WIDGET_TYPE_HEALTH_STATUS = 'HEALTH_STATUS';
 export const WIDGET_TYPE_LINKED_ITEMS = 'LINKED_ITEMS';