diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-09-21 11:12:07 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-09-21 11:12:07 +0300 |
| commit | a293640404cbe7fc7ff60a04f77113ddcf990c6a (patch) | |
| tree | c668e7b813c0f0740165e683c2845618a82991c6 /app | |
| parent | a5491fd12d12715001a6383a1fd940edd4a1ae32 (diff) | |
| parent | 49c07a4139701cef14e9f1335c819f618717bf95 (diff) | |
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
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 |