diff --git a/app/assets/javascripts/contribution_events/constants.js b/app/assets/javascripts/contribution_events/constants.js index c0224ce94ffd1dc9e8512df358d86f679294de8d..30bb32b4c480670dfde3190e67b68feca1364f5a 100644 --- a/app/assets/javascripts/contribution_events/constants.js +++ b/app/assets/javascripts/contribution_events/constants.js @@ -153,7 +153,7 @@ export const EVENT_CLOSED_ICONS = Object.freeze({ }); export const EVENT_REOPENED_ICONS = Object.freeze({ - [TARGET_TYPE_MERGE_REQUEST]: 'merge-request-open', + [TARGET_TYPE_MERGE_REQUEST]: 'merge-request', [TYPE_FALLBACK]: 'status_open', }); diff --git a/app/assets/javascripts/issuable/components/status_badge.vue b/app/assets/javascripts/issuable/components/status_badge.vue index c08153df839853c8f596de5c9cff79343ad6feaa..3ce768298c829514e191c53978e16b42389ccfeb 100644 --- a/app/assets/javascripts/issuable/components/status_badge.vue +++ b/app/assets/javascripts/issuable/components/status_badge.vue @@ -43,7 +43,7 @@ const badgePropertiesMap = { }, [TYPE_MERGE_REQUEST]: { [STATUS_OPEN]: { - icon: 'merge-request-open', + icon: 'merge-request', text: __('Open'), variant: 'success', }, @@ -58,7 +58,7 @@ const badgePropertiesMap = { variant: 'info', }, [STATUS_LOCKED]: { - icon: 'merge-request-open', + icon: 'merge-request', text: __('Open'), variant: 'success', }, diff --git a/app/assets/javascripts/super_sidebar/components/user_bar.vue b/app/assets/javascripts/super_sidebar/components/user_bar.vue index 4dd227745aca097222cd894582fa97b77e760311..cc8d26e39080c8a41296b6923af55a9dd5d9f4e4 100644 --- a/app/assets/javascripts/super_sidebar/components/user_bar.vue +++ b/app/assets/javascripts/super_sidebar/components/user_bar.vue @@ -180,7 +180,7 @@ export default { <counter v-gl-tooltip:super-sidebar.bottom="mrMenuShown ? '' : $options.i18n.mergeRequests" class="gl-w-full" - icon="merge-request-open" + icon="merge-request" :href="sidebarData.merge_request_dashboard_path" :count="mergeRequestTotalCount" :label="$options.i18n.mergeRequests" diff --git a/app/assets/javascripts/vue_shared/components/notes/system_note.vue b/app/assets/javascripts/vue_shared/components/notes/system_note.vue index 5a5d255fc591812ef6b02333659e841c7be47fe6..2553fe6501bd5f2a37934775385b9d2b61288fa0 100644 --- a/app/assets/javascripts/vue_shared/components/notes/system_note.vue +++ b/app/assets/javascripts/vue_shared/components/notes/system_note.vue @@ -108,7 +108,7 @@ export default { if (this.note.noteable_type === 'Issue') { icon = 'issue-open-m'; } else if (this.note.noteable_type === 'MergeRequest') { - icon = 'merge-request-open'; + icon = 'merge-request'; } } return icon; diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb index ecc253ca967e96035a14faa8135b031ce6c0656e..91616afb5e0b40a2a16b31e9654c2b4beae5d1c3 100644 --- a/app/helpers/branches_helper.rb +++ b/app/helpers/branches_helper.rb @@ -30,7 +30,7 @@ def merge_request_status(merge_request) variant = :success variant = :warning if merge_request.draft? - mr_icon = 'merge-request-open' + mr_icon = 'merge-request' mr_status = _('Open') elsif merge_request.merged? variant = :info diff --git a/spec/frontend/contribution_events/components/contribution_event/contribution_event_reopened_spec.js b/spec/frontend/contribution_events/components/contribution_event/contribution_event_reopened_spec.js index 9001bb284c7c4c576f309634cb2a1d879c7c9db0..e3660acce270692c08e6941a06eed7f4de52f1e0 100644 --- a/spec/frontend/contribution_events/components/contribution_event/contribution_event_reopened_spec.js +++ b/spec/frontend/contribution_events/components/contribution_event/contribution_event_reopened_spec.js @@ -23,7 +23,7 @@ describe('ContributionEventReopened', () => { event | expectedMessage | iconName ${eventMilestoneReopened()} | ${'Reopened milestone %{targetLink} in %{resourceParentLink}.'} | ${'status_open'} ${eventIssueReopened()} | ${'Reopened issue %{targetLink} in %{resourceParentLink}.'} | ${'status_open'} - ${eventMergeRequestReopened()} | ${'Reopened merge request %{targetLink} in %{resourceParentLink}.'} | ${'merge-request-open'} + ${eventMergeRequestReopened()} | ${'Reopened merge request %{targetLink} in %{resourceParentLink}.'} | ${'merge-request'} ${{ target: { type: 'unsupported type' } }} | ${'Reopened resource.'} | ${'status_open'} `('when event target type is $event.target.type', ({ event, expectedMessage, iconName }) => { it('renders `ContributionEventBase` with correct props', () => { diff --git a/spec/frontend/issuable/components/status_badge_spec.js b/spec/frontend/issuable/components/status_badge_spec.js index 9ab5b4f714933b1eb2cd602d758a11afb8025bd2..21fa5fbc208ae5cd2b0f3bbbcd16d0dffd764f85 100644 --- a/spec/frontend/issuable/components/status_badge_spec.js +++ b/spec/frontend/issuable/components/status_badge_spec.js @@ -13,7 +13,7 @@ describe('StatusBadge component', () => { describe.each` issuableType | badgeText | state | badgeVariant | badgeIcon - ${'merge_request'} | ${'Open'} | ${'opened'} | ${'success'} | ${'merge-request-open'} + ${'merge_request'} | ${'Open'} | ${'opened'} | ${'success'} | ${'merge-request'} ${'merge_request'} | ${'Closed'} | ${'closed'} | ${'danger'} | ${'merge-request-close'} ${'merge_request'} | ${'Merged'} | ${'merged'} | ${'info'} | ${'merge'} ${'issue'} | ${'Open'} | ${'opened'} | ${'success'} | ${'issue-open-m'} diff --git a/spec/helpers/branches_helper_spec.rb b/spec/helpers/branches_helper_spec.rb index 3375686765382eec80782b16ad2e2d522661cbfc..c9e82c03863e8fbfd2d7b03a3282185ddc178347 100644 --- a/spec/helpers/branches_helper_spec.rb +++ b/spec/helpers/branches_helper_spec.rb @@ -69,19 +69,19 @@ end context 'when merge request is open' do - it { is_expected.to eq(icon: 'merge-request-open', title: "Open - #{title}", variant: :success) } + it { is_expected.to eq(icon: 'merge-request', title: "Open - #{title}", variant: :success) } end context 'when merge request is locked' do let(:merge_request) { build(:merge_request, :locked, title: title) } - it { is_expected.to eq(icon: 'merge-request-open', title: "Open - #{title}", variant: :success) } + it { is_expected.to eq(icon: 'merge-request', title: "Open - #{title}", variant: :success) } end context 'when merge request is draft' do let(:title) { 'Draft: Test MR' } - it { is_expected.to eq(icon: 'merge-request-open', title: "Open - #{title}", variant: :warning) } + it { is_expected.to eq(icon: 'merge-request', title: "Open - #{title}", variant: :warning) } end context 'when merge request is merged' do