Merge branch 'fix-chat-notification-service-for-ee' into 'master'

Fix activity titles for MRs in chat notification services

Closes gitlab-ee#5325

See merge request gitlab-org/gitlab-ce!21834

app/models/project_services/chat_message/merge_message.rb

@@ -26,7 +26,7 @@ module ChatMessage
 
     def activity
       {
-        title: "Merge Request #{state} by #{user_combined_name}",
+        title: "Merge Request #{state_or_action_text} by #{user_combined_name}",
         subtitle: "in #{project_link}",
         text: merge_request_link,
         image: user_avatar

changelogs/unreleased/fix-chat-notification-service-for-ee.yml

+---
+title: Fix activity titles for MRs in chat notification services
+merge_request: 21834
+author:
+type: fixed

spec/models/project_services/chat_message/merge_message_spec.rb

@@ -27,6 +27,23 @@ describe ChatMessage::MergeMessage do
     }
   end
 
+  # Integration point in EE
+  context 'when state is overridden' do
+    it 'respects the overridden state' do
+      allow(subject).to receive(:state_or_action_text) { 'devoured' }
+
+      aggregate_failures do
+        expect(subject.summary).not_to include('opened')
+        expect(subject.summary).to include('devoured')
+
+        activity_title = subject.activity[:title]
+
+        expect(activity_title).not_to include('opened')
+        expect(activity_title).to include('devoured')
+      end
+    end
+  end
+
   context 'without markdown' do
     let(:color) { '#345' }