diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-09-20 11:47:08 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-09-20 11:52:14 +0100 |
| commit | 49c07a4139701cef14e9f1335c819f618717bf95 (patch) | |
| tree | 72776ba5437f76831771b1792c869a3c1b6af285 /app | |
| parent | 8c2192943a5efc4d0a28c67b04bf9b979def66a1 (diff) | |
| download | gitlab-ce-49c07a4139701cef14e9f1335c819f618717bf95.tar.gz | |
Fix activity titles for MRs in chat notification services
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_services/chat_message/merge_message.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/chat_message/merge_message.rb b/app/models/project_services/chat_message/merge_message.rb index cc88d57faf8..6b7a35aaa75 100644 --- a/app/models/project_services/chat_message/merge_message.rb +++ b/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 |