Merge branch 'wiki-page-message' into 'master'

Do not post entire Wiki page content as chat notification

Closes #20812

See merge request gitlab-org/gitlab!21722

app/models/project_services/chat_message/wiki_page_message.rb

@@ -14,7 +14,7 @@ module ChatMessage
       obj_attr = HashWithIndifferentAccess.new(obj_attr)
       @title = obj_attr[:title]
       @wiki_page_url = obj_attr[:url]
-      @description = obj_attr[:content]
+      @description = obj_attr[:message]
 
       @action =
         case obj_attr[:action]

changelogs/unreleased/wiki-page-message.yml

+---
+title: Include commit message instead of entire page content in Wiki chat notifications
+merge_request: 21722
+author: Ville Skyttä
+type: changed

spec/models/project_services/chat_message/wiki_page_message_spec.rb

@@ -17,7 +17,8 @@ describe ChatMessage::WikiPageMessage do
       object_attributes: {
         title: 'Wiki page title',
         url: 'http://url.com',
-        content: 'Wiki page description'
+        content: 'Wiki page content',
+        message: 'Wiki page commit message'
       }
     }
   end
@@ -57,10 +58,10 @@ describe ChatMessage::WikiPageMessage do
           args[:object_attributes][:action] = 'create'
         end
 
-        it 'returns the attachment for a new wiki page' do
+        it 'returns the commit message for a new wiki page' do
           expect(subject.attachments).to eq([
             {
-              text: "Wiki page description",
+              text: "Wiki page commit message",
               color: color
             }
           ])
@@ -72,10 +73,10 @@ describe ChatMessage::WikiPageMessage do
           args[:object_attributes][:action] = 'update'
         end
 
-        it 'returns the attachment for an updated wiki page' do
+        it 'returns the commit message for an updated wiki page' do
           expect(subject.attachments).to eq([
             {
-              text: "Wiki page description",
+              text: "Wiki page commit message",
               color: color
             }
           ])
@@ -119,8 +120,8 @@ describe ChatMessage::WikiPageMessage do
           args[:object_attributes][:action] = 'create'
         end
 
-        it 'returns the attachment for a new wiki page' do
-          expect(subject.attachments).to eq('Wiki page description')
+        it 'returns the commit message for a new wiki page' do
+          expect(subject.attachments).to eq('Wiki page commit message')
         end
       end
 
@@ -129,8 +130,8 @@ describe ChatMessage::WikiPageMessage do
           args[:object_attributes][:action] = 'update'
         end
 
-        it 'returns the attachment for an updated wiki page' do
-          expect(subject.attachments).to eq('Wiki page description')
+        it 'returns the commit message for an updated wiki page' do
+          expect(subject.attachments).to eq('Wiki page commit message')
         end
       end
     end