Merge branch 'mirgate-merge-request-open-icon-jmiocene' into 'master'

Migrate merge-request-open icon to merge-request

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159629



Merged-by: Phil Hughes <me@iamphill.com>
Approved-by: Coung Ngo <cngo@gitlab.com>
Approved-by: Scott de Jonge <sdejonge@gitlab.com>
Approved-by: Phil Hughes <me@iamphill.com>
Co-authored-by: Julia Miocene <jmiocene@gitlab.com>

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',
 });
 

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',
     },

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"

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;

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

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', () => {

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'}

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