Merge branch '323061-aqualls-merging' into 'master'

Improve merge message UI text

See merge request gitlab-org/gitlab!59693

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue

@@ -19,7 +19,10 @@ export default {
   <div class="mr-widget-body mr-state-locked media">
     <status-icon status="loading" />
     <div class="media-body">
-      <h4>{{ s__('mrWidget|This merge request is in the process of being merged') }}</h4>
+      <h4>
+        {{ s__('mrWidget|Merging! Drum roll, please…') }}
+        <gl-emoji data-name="drum" />
+      </h4>
       <section class="mr-info-list">
         <p>
           {{ s__('mrWidget|The changes will be merged into') }}

changelogs/unreleased/323061-aqualls-merging.yml

+---
+title: Improve merge message UI text
+merge_request: 59693
+author:
+type: changed

locale/gitlab.pot

@@ -38135,6 +38135,9 @@ msgstr ""
 msgid "mrWidget|Merged by"
 msgstr ""
 
+msgid "mrWidget|Merging! Drum roll, please…"
+msgstr ""
+
 msgid "mrWidget|More information"
 msgstr ""
 
@@ -38228,9 +38231,6 @@ msgstr ""
 msgid "mrWidget|This merge request failed to be merged automatically"
 msgstr ""
 
-msgid "mrWidget|This merge request is in the process of being merged"
-msgstr ""
-
 msgid "mrWidget|This project is archived, write access has been disabled"
 msgstr ""
 

spec/features/merge_request/user_sees_merge_widget_spec.rb

@@ -445,7 +445,7 @@ RSpec.describe 'Merge request > User sees merge widget', :js do
       wait_for_requests
 
       expect(page).not_to have_button('Merge')
-      expect(page).to have_content('This merge request is in the process of being merged')
+      expect(page).to have_content('Merging! Drum roll, please…')
     end
   end
 

spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js

@@ -4,6 +4,7 @@ import MrWidgetMerging from '~/vue_merge_request_widget/components/states/mr_wid
 describe('MRWidgetMerging', () => {
   let wrapper;
 
+  const GlEmoji = { template: '<img />' };
   beforeEach(() => {
     wrapper = shallowMount(MrWidgetMerging, {
       propsData: {
@@ -12,6 +13,9 @@ describe('MRWidgetMerging', () => {
           targetBranch: 'branch',
         },
       },
+      stubs: {
+        GlEmoji,
+      },
     });
   });
 
@@ -27,7 +31,7 @@ describe('MRWidgetMerging', () => {
         .trim()
         .replace(/\s\s+/g, ' ')
         .replace(/[\r\n]+/g, ' '),
-    ).toContain('This merge request is in the process of being merged');
+    ).toContain('Merging! Drum roll, please…');
   });
 
   it('renders branch information', () => {