diff options
| author | Jeff Brown <jlenardbrown@gmail.com> | 2018-06-11 10:28:30 +0200 |
|---|---|---|
| committer | Jeff Brown <jlenardbrown@gmail.com> | 2018-06-12 13:32:11 +0200 |
| commit | 9aad5ed0a23a6386bf48f166a6b07b3a41d9c2c1 (patch) | |
| tree | 88bb15435aa21bc38afda1346cb1f07f8b767a32 /app/models/project_services/chat_message | |
| parent | 54a6ca6f38764dd1a863d0035af9541b5a52c583 (diff) | |
| download | gitlab-ce-9aad5ed0a23a6386bf48f166a6b07b3a41d9c2c1.tar.gz | |
Fixes Microsoft Teams notifications for pipeline events
Closes #42342
Diffstat (limited to 'app/models/project_services/chat_message')
| -rw-r--r-- | app/models/project_services/chat_message/base_message.rb | 7 | ||||
| -rw-r--r-- | app/models/project_services/chat_message/pipeline_message.rb | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/models/project_services/chat_message/base_message.rb b/app/models/project_services/chat_message/base_message.rb index 22a65b5145e..f710fa85b5d 100644 --- a/app/models/project_services/chat_message/base_message.rb +++ b/app/models/project_services/chat_message/base_message.rb @@ -26,13 +26,18 @@ module ChatMessage end end - def pretext + def summary return message if markdown format(message) end + def pretext + summary + end + def fallback + format(message) end def attachments diff --git a/app/models/project_services/chat_message/pipeline_message.rb b/app/models/project_services/chat_message/pipeline_message.rb index 2135122278a..96fd23aede3 100644 --- a/app/models/project_services/chat_message/pipeline_message.rb +++ b/app/models/project_services/chat_message/pipeline_message.rb @@ -23,10 +23,6 @@ module ChatMessage '' end - def fallback - format(message) - end - def attachments return message if markdown |