From 2fa173410ad24b37aba6450ae4530ec231844d86 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 22 Sep 2022 09:15:04 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../boards/components/board_card_inner.vue | 6 +-- app/assets/javascripts/boards/constants.js | 11 ----- .../issuable_blocked_icon/constants.js | 12 +++++ .../graphql/blocking_epics.query.graphql} | 2 +- .../graphql/blocking_issues.query.graphql} | 2 +- .../issuable_blocked_icon.vue} | 21 ++++++--- app/views/shared/_file_highlight.html.haml | 3 +- doc/administration/raketasks/maintenance.md | 6 +++ doc/architecture/blueprints/_template.md | 5 +- doc/update/index.md | 10 ++-- .../img/roadmap_blocked_icon_v15_5.png | Bin 0 -> 25453 bytes doc/user/group/roadmap/index.md | 10 ++++ .../merge_requests/reviews/data_usage.md | 44 ++++++++++++++++++ .../reviews/img/suggested_reviewers_v15_4.png | Bin 0 -> 20617 bytes .../project/merge_requests/reviews/index.md | 20 ++++++++ spec/features/issues/incident_issue_spec.rb | 8 ++-- spec/frontend/boards/board_card_inner_spec.js | 8 ++-- .../issuable_blocked_icon_spec.js.snap} | 12 ++--- .../issuable/issuable_blocked_icon_spec.js} | 13 +++--- workhorse/internal/queueing/queue.go | 23 +++++---- workhorse/internal/queueing/queue_test.go | 8 ++-- workhorse/internal/queueing/requests.go | 6 ++- workhorse/internal/queueing/requests_test.go | 6 ++- .../destination/objectstore/s3_session.go | 13 +----- .../objectstore/s3_session_test.go | 18 ++++--- workhorse/internal/upstream/routes.go | 3 +- 26 files changed, 182 insertions(+), 88 deletions(-) create mode 100644 app/assets/javascripts/vue_shared/components/issuable_blocked_icon/constants.js rename app/assets/javascripts/{boards/graphql/board_blocking_epics.query.graphql => vue_shared/components/issuable_blocked_icon/graphql/blocking_epics.query.graphql} (83%) rename app/assets/javascripts/{boards/graphql/board_blocking_issues.query.graphql => vue_shared/components/issuable_blocked_icon/graphql/blocking_issues.query.graphql} (81%) rename app/assets/javascripts/{boards/components/board_blocked_icon.vue => vue_shared/components/issuable_blocked_icon/issuable_blocked_icon.vue} (89%) create mode 100644 doc/user/group/roadmap/img/roadmap_blocked_icon_v15_5.png create mode 100644 doc/user/project/merge_requests/reviews/data_usage.md create mode 100644 doc/user/project/merge_requests/reviews/img/suggested_reviewers_v15_4.png rename spec/frontend/{boards/components/__snapshots__/board_blocked_icon_spec.js.snap => vue_shared/issuable/__snapshots__/issuable_blocked_icon_spec.js.snap} (64%) rename spec/frontend/{boards/components/board_blocked_icon_spec.js => vue_shared/issuable/issuable_blocked_icon_spec.js} (95%) diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue index 92a623d65d4..956d62c29f3 100644 --- a/app/assets/javascripts/boards/components/board_card_inner.vue +++ b/app/assets/javascripts/boards/components/board_card_inner.vue @@ -17,9 +17,9 @@ import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/toolt import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import BoardCardMoveToPosition from '~/boards/components/board_card_move_to_position.vue'; import WorkItemTypeIcon from '~/work_items/components/work_item_type_icon.vue'; +import IssuableBlockedIcon from '~/vue_shared/components/issuable_blocked_icon/issuable_blocked_icon.vue'; import { ListType } from '../constants'; import eventHub from '../eventhub'; -import BoardBlockedIcon from './board_blocked_icon.vue'; import IssueDueDate from './issue_due_date.vue'; import IssueTimeEstimate from './issue_time_estimate.vue'; @@ -34,7 +34,7 @@ export default { IssueDueDate, IssueTimeEstimate, IssueCardWeight: () => import('ee_component/boards/components/issue_card_weight.vue'), - BoardBlockedIcon, + IssuableBlockedIcon, GlSprintf, BoardCardMoveToPosition, WorkItemTypeIcon, @@ -218,7 +218,7 @@ export default {

- import { GlIcon, GlLink, GlPopover, GlLoadingIcon } from '@gitlab/ui'; -import { blockingIssuablesQueries, issuableTypes } from '~/boards/constants'; +import { issuableTypes } from '~/boards/constants'; import { TYPE_ISSUE, TYPE_EPIC } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import { truncate } from '~/lib/utils/text_utility'; import { __, n__, s__, sprintf } from '~/locale'; +import { blockingIssuablesQueries } from './constants'; export default { i18n: { @@ -28,7 +29,6 @@ export default { GlLink, GlLoadingIcon, }, - blockingIssuablesQueries, props: { item: { type: Object, @@ -169,8 +169,8 @@ export default { :id="glIconId" ref="icon" :name="blockIcon" - class="issue-blocked-icon gl-mr-2 gl-cursor-pointer gl-text-red-500" - data-testid="issue-blocked-icon" + class="issuable-blocked-icon gl-mr-2 gl-cursor-pointer gl-text-red-500" + data-testid="issuable-blocked-icon" @mouseenter="handleMouseEnter" /> @@ -182,12 +182,19 @@ export default {

{{ loadingMessage }}