From 8904aca6e7bc9ff66fc4fe23edc179a2c0f431e1 Mon Sep 17 00:00:00 2001
From: Julia Miocene <jmiocene@gitlab.com>
Date: Wed, 17 Jul 2024 12:39:50 +0200
Subject: [PATCH] Migrate git-merge icon to merge-request

---
 app/assets/javascripts/ci/constants.js                      | 2 +-
 .../contribution_event/contribution_event_merged.vue        | 6 +++++-
 app/assets/javascripts/ide/components/mr_file_icon.vue      | 2 +-
 app/assets/javascripts/notes/constants.js                   | 2 +-
 .../package_registry/components/list/publish_method.vue     | 2 +-
 .../shared/components/publish_method.vue                    | 2 +-
 app/assets/javascripts/vue_shared/components/commit.vue     | 2 +-
 .../components/projects_list/projects_list_item.vue         | 2 +-
 app/views/shared/projects/_project.html.haml                | 2 +-
 app/views/shared/projects/_project_card.html.haml           | 2 +-
 .../shared/filtered_search/tokens/activity_token.vue        | 2 +-
 .../components/shared/filters/activity_filter.vue           | 2 +-
 .../shared/filtered_search/tokens/activity_token_spec.js    | 2 +-
 lib/sidebars/groups/menus/merge_requests_menu.rb            | 2 +-
 lib/sidebars/projects/menus/merge_requests_menu.rb          | 2 +-
 .../contribution_event/contribution_event_merged_spec.js    | 2 +-
 spec/frontend/ide/components/file_row_extra_spec.js         | 2 +-
 .../list/__snapshots__/publish_method_spec.js.snap          | 2 +-
 .../components/__snapshots__/publish_method_spec.js.snap    | 2 +-
 spec/frontend/vue_shared/components/commit_spec.js          | 2 +-
 .../components/projects_list/projects_list_item_spec.js     | 2 +-
 21 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/ci/constants.js b/app/assets/javascripts/ci/constants.js
index 53c7f87b441d73..787ea2384cc2fa 100644
--- a/app/assets/javascripts/ci/constants.js
+++ b/app/assets/javascripts/ci/constants.js
@@ -15,7 +15,7 @@ export const JOB_GRAPHQL_ERRORS = {
 
 export const ICONS = {
   TAG: 'tag',
-  MR: 'git-merge',
+  MR: 'merge-request',
   BRANCH: 'branch',
   RETRY: 'retry',
   SUCCESS: 'success',
diff --git a/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_merged.vue b/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_merged.vue
index 622f0fd70ac111..5bec60cca068cc 100644
--- a/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_merged.vue
+++ b/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_merged.vue
@@ -20,5 +20,9 @@ export default {
 </script>
 
 <template>
-  <contribution-event-base :event="event" :message="$options.i18n.message" icon-name="git-merge" />
+  <contribution-event-base
+    :event="event"
+    :message="$options.i18n.message"
+    icon-name="merge-request"
+  />
 </template>
diff --git a/app/assets/javascripts/ide/components/mr_file_icon.vue b/app/assets/javascripts/ide/components/mr_file_icon.vue
index af297753c28f67..47e80a4b93822f 100644
--- a/app/assets/javascripts/ide/components/mr_file_icon.vue
+++ b/app/assets/javascripts/ide/components/mr_file_icon.vue
@@ -16,7 +16,7 @@ export default {
     v-gl-tooltip
     :title="__('Part of merge request changes')"
     :size="12"
-    name="git-merge"
+    name="merge-request"
     class="gl-mr-3"
   />
 </template>
diff --git a/app/assets/javascripts/notes/constants.js b/app/assets/javascripts/notes/constants.js
index 282bf93a5741c4..0ce31d5bba5da4 100644
--- a/app/assets/javascripts/notes/constants.js
+++ b/app/assets/javascripts/notes/constants.js
@@ -118,7 +118,7 @@ export const MR_FILTER_OPTIONS = [
   {
     text: __('Merge request status'),
     value: 'status',
-    systemNoteIcons: ['git-merge', 'issue-close', 'issues', 'merge-request-close'],
+    systemNoteIcons: ['merge-request', 'issue-close', 'issues', 'merge-request-close'],
   },
   {
     text: __('Tracking'),
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/list/publish_method.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/list/publish_method.vue
index 781445240d8c75..6ed97d3278754e 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/components/list/publish_method.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/components/list/publish_method.vue
@@ -35,7 +35,7 @@ export default {
 <template>
   <div class="gl-display-flex gl-align-items-center">
     <template v-if="hasPipeline">
-      <gl-icon name="git-merge" class="gl-mr-2" />
+      <gl-icon name="merge-request" class="gl-mr-2" />
       <span data-testid="pipeline-ref" class="gl-mr-2">{{ pipeline.ref }}</span>
 
       <gl-icon name="commit" class="gl-mr-2" />
diff --git a/app/assets/javascripts/packages_and_registries/shared/components/publish_method.vue b/app/assets/javascripts/packages_and_registries/shared/components/publish_method.vue
index 8a66a33f2ab89a..d5224768de6e8b 100644
--- a/app/assets/javascripts/packages_and_registries/shared/components/publish_method.vue
+++ b/app/assets/javascripts/packages_and_registries/shared/components/publish_method.vue
@@ -38,7 +38,7 @@ export default {
 <template>
   <div class="gl-display-flex gl-align-items-center">
     <template v-if="hasPipeline">
-      <gl-icon name="git-merge" class="gl-mr-2" />
+      <gl-icon name="merge-request" class="gl-mr-2" />
       <span data-testid="pipeline-ref" class="gl-mr-2">{{ packageEntity.pipeline.ref }}</span>
 
       <gl-icon name="commit" class="gl-mr-2" />
diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue
index c2f672b2edd79f..83ad8603dd2f76 100644
--- a/app/assets/javascripts/vue_shared/components/commit.vue
+++ b/app/assets/javascripts/vue_shared/components/commit.vue
@@ -148,7 +148,7 @@ export default {
     <template v-if="shouldShowRefInfo">
       <div class="icon-container gl-display-inline-block">
         <gl-icon v-if="tag" name="tag" />
-        <gl-icon v-else-if="mergeRequestRef" name="git-merge" />
+        <gl-icon v-else-if="mergeRequestRef" name="merge-request" />
         <gl-icon v-else name="branch" />
       </div>
 
diff --git a/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue b/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
index 9c1fd495038a28..ae248b6eaaee79 100644
--- a/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
+++ b/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
@@ -374,7 +374,7 @@ export default {
             :aria-label="$options.i18n.mergeRequests"
             class="gl-text-secondary"
           >
-            <gl-icon name="git-merge" />
+            <gl-icon name="merge-request" />
             <span>{{ openMergeRequestsCount }}</span>
           </gl-link>
           <gl-link
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index 3489e03e0ebf21..0f62432e26081d 100644
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -107,7 +107,7 @@
           = badge_count(project.forks_count)
       - if show_count?(disabled: !merge_requests, compact_mode: compact_mode)
         = link_to project_merge_requests_path(project), class: "#{css_metadata_classes} merge-requests", title: _('Merge requests'), data: { container: 'body', placement: 'top' } do
-          = sprite_icon('git-merge', size: 14, css_class: 'gl-mr-2')
+          = sprite_icon('merge-request', size: 14, css_class: 'gl-mr-2')
           = badge_count(project.open_merge_requests_count)
       - if show_count?(disabled: !issues, compact_mode: compact_mode)
         = link_to project_issues_path(project), class: "#{css_metadata_classes} issues", title: _('Issues'), data: { container: 'body', placement: 'top' } do
diff --git a/app/views/shared/projects/_project_card.html.haml b/app/views/shared/projects/_project_card.html.haml
index 331c97fb3a0856..57d2a786e2f4a8 100644
--- a/app/views/shared/projects/_project_card.html.haml
+++ b/app/views/shared/projects/_project_card.html.haml
@@ -69,7 +69,7 @@
               = badge_count(project.forks_count)
           - if show_count?(disabled: !merge_requests, compact_mode: compact_mode)
             = link_to project_merge_requests_path(project), class: "#{css_metadata_classes} merge-requests", title: _('Merge requests'), data: { container: 'body', placement: 'top' } do
-              = sprite_icon('git-merge', size: 14, css_class: 'gl-mr-2')
+              = sprite_icon('merge-request', size: 14, css_class: 'gl-mr-2')
               = badge_count(project.open_merge_requests_count)
           - if show_count?(disabled: !issues, compact_mode: compact_mode)
             = link_to project_issues_path(project), class: "#{css_metadata_classes} issues", title: _('Issues'), data: { container: 'body', placement: 'top' } do
diff --git a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/activity_token.vue b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/activity_token.vue
index d10260bef96431..512e3a28208782 100644
--- a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/activity_token.vue
+++ b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/activity_token.vue
@@ -41,7 +41,7 @@ const GROUPS = [
   {
     text: s__('SecurityReports|Merge Request'),
     options: [ITEMS.HAS_MERGE_REQUEST, ITEMS.DOES_NOT_HAVE_MERGE_REQUEST],
-    icon: 'git-merge',
+    icon: 'merge-request',
   },
   {
     text: s__('SecurityReports|Solution available'),
diff --git a/ee/app/assets/javascripts/security_dashboard/components/shared/filters/activity_filter.vue b/ee/app/assets/javascripts/security_dashboard/components/shared/filters/activity_filter.vue
index c0952ee2d95092..8cb1c8f109398f 100644
--- a/ee/app/assets/javascripts/security_dashboard/components/shared/filters/activity_filter.vue
+++ b/ee/app/assets/javascripts/security_dashboard/components/shared/filters/activity_filter.vue
@@ -67,7 +67,7 @@ export const GROUPS = [
   {
     text: s__('SecurityReports|Merge Request'),
     options: [ITEMS.HAS_MERGE_REQUEST, ITEMS.DOES_NOT_HAVE_MERGE_REQUEST],
-    icon: 'git-merge',
+    icon: 'merge-request',
   },
   {
     text: s__('SecurityReports|Solution available'),
diff --git a/ee/spec/frontend/security_dashboard/components/shared/filtered_search/tokens/activity_token_spec.js b/ee/spec/frontend/security_dashboard/components/shared/filtered_search/tokens/activity_token_spec.js
index f57d9a5dcaa241..3784e7c45099a8 100644
--- a/ee/spec/frontend/security_dashboard/components/shared/filtered_search/tokens/activity_token_spec.js
+++ b/ee/spec/frontend/security_dashboard/components/shared/filtered_search/tokens/activity_token_spec.js
@@ -129,7 +129,7 @@ describe('ActivityToken', () => {
       expect(findAllBadges().wrappers.map((component) => component.props('icon'))).toEqual([
         'check-circle-dashed',
         'issues',
-        'git-merge',
+        'merge-request',
         'bulb',
       ]);
     });
diff --git a/lib/sidebars/groups/menus/merge_requests_menu.rb b/lib/sidebars/groups/menus/merge_requests_menu.rb
index 356c823add9c04..2038b81e22d013 100644
--- a/lib/sidebars/groups/menus/merge_requests_menu.rb
+++ b/lib/sidebars/groups/menus/merge_requests_menu.rb
@@ -18,7 +18,7 @@ def title
 
         override :sprite_icon
         def sprite_icon
-          'git-merge'
+          'merge-request'
         end
 
         override :render?
diff --git a/lib/sidebars/projects/menus/merge_requests_menu.rb b/lib/sidebars/projects/menus/merge_requests_menu.rb
index eb6827f90e7ce3..646be919b733cf 100644
--- a/lib/sidebars/projects/menus/merge_requests_menu.rb
+++ b/lib/sidebars/projects/menus/merge_requests_menu.rb
@@ -23,7 +23,7 @@ def title
 
         override :sprite_icon
         def sprite_icon
-          'git-merge'
+          'merge-request'
         end
 
         override :render?
diff --git a/spec/frontend/contribution_events/components/contribution_event/contribution_event_merged_spec.js b/spec/frontend/contribution_events/components/contribution_event/contribution_event_merged_spec.js
index e9c29da31466ce..f4e5e3be50bc3f 100644
--- a/spec/frontend/contribution_events/components/contribution_event/contribution_event_merged_spec.js
+++ b/spec/frontend/contribution_events/components/contribution_event/contribution_event_merged_spec.js
@@ -23,7 +23,7 @@ describe('ContributionEventMerged', () => {
   it('renders `ContributionEventBase`', () => {
     expect(wrapper.findComponent(ContributionEventBase).props()).toEqual({
       event: defaultPropsData.event,
-      iconName: 'git-merge',
+      iconName: 'merge-request',
       message: ContributionEventMerged.i18n.message,
     });
   });
diff --git a/spec/frontend/ide/components/file_row_extra_spec.js b/spec/frontend/ide/components/file_row_extra_spec.js
index 2ce4ea8a808849..bd5bcccf5976b3 100644
--- a/spec/frontend/ide/components/file_row_extra_spec.js
+++ b/spec/frontend/ide/components/file_row_extra_spec.js
@@ -128,7 +128,7 @@ describe('IDE extra file row component', () => {
   });
 
   describe('merge request icon', () => {
-    const findMergeRequestIcon = () => wrapper.find('[data-testid="git-merge-icon"]');
+    const findMergeRequestIcon = () => wrapper.find('[data-testid="merge-request-icon"]');
 
     it('hides when not a merge request change', () => {
       createComponent();
diff --git a/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/publish_method_spec.js.snap b/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/publish_method_spec.js.snap
index 7dd6be2f034466..d54ebb72f28a5d 100644
--- a/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/publish_method_spec.js.snap
+++ b/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/publish_method_spec.js.snap
@@ -6,7 +6,7 @@ exports[`publish_method renders 1`] = `
 >
   <gl-icon-stub
     class="gl-mr-2"
-    name="git-merge"
+    name="merge-request"
     size="16"
     variant="current"
   />
diff --git a/spec/frontend/packages_and_registries/shared/components/__snapshots__/publish_method_spec.js.snap b/spec/frontend/packages_and_registries/shared/components/__snapshots__/publish_method_spec.js.snap
index dc713ab1b38047..9bd2ebd20b9af9 100644
--- a/spec/frontend/packages_and_registries/shared/components/__snapshots__/publish_method_spec.js.snap
+++ b/spec/frontend/packages_and_registries/shared/components/__snapshots__/publish_method_spec.js.snap
@@ -6,7 +6,7 @@ exports[`publish_method renders 1`] = `
 >
   <gl-icon-stub
     class="gl-mr-2"
-    name="git-merge"
+    name="merge-request"
     size="16"
     variant="current"
   />
diff --git a/spec/frontend/vue_shared/components/commit_spec.js b/spec/frontend/vue_shared/components/commit_spec.js
index 62a2738d8dfe7e..48d94bc88b48c5 100644
--- a/spec/frontend/vue_shared/components/commit_spec.js
+++ b/spec/frontend/vue_shared/components/commit_spec.js
@@ -189,7 +189,7 @@ describe('Commit component', () => {
 
       expect(refEl.attributes('href')).toBe(props.mergeRequestRef.path);
 
-      expect(findIcon('git-merge').exists()).toBe(true);
+      expect(findIcon('merge-request').exists()).toBe(true);
     });
   });
 
diff --git a/spec/frontend/vue_shared/components/projects_list/projects_list_item_spec.js b/spec/frontend/vue_shared/components/projects_list/projects_list_item_spec.js
index 68e4c0f7c7a684..b31ffa6d21b8b6 100644
--- a/spec/frontend/vue_shared/components/projects_list/projects_list_item_spec.js
+++ b/spec/frontend/vue_shared/components/projects_list/projects_list_item_spec.js
@@ -212,7 +212,7 @@ describe('ProjectsListItem', () => {
       expect(tooltip.value).toBe(ProjectsListItem.i18n.mergeRequests);
       expect(mergeRequestsLink.attributes('href')).toBe(`${project.webUrl}/-/merge_requests`);
       expect(mergeRequestsLink.text()).toBe('5');
-      expect(mergeRequestsLink.findComponent(GlIcon).props('name')).toBe('git-merge');
+      expect(mergeRequestsLink.findComponent(GlIcon).props('name')).toBe('merge-request');
     });
   });
 
-- 
GitLab