Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-09-20 13:47:08 +0300
committerNick Thomas <nick@gitlab.com>2018-09-20 13:52:14 +0300
commit49c07a4139701cef14e9f1335c819f618717bf95 (patch)
tree72776ba5437f76831771b1792c869a3c1b6af285 /app/models/project_services
parent8c2192943a5efc4d0a28c67b04bf9b979def66a1 (diff)
Fix activity titles for MRs in chat notification services
Diffstat (limited to 'app/models/project_services')
-rw-r--r--app/models/project_services/chat_message/merge_message.rb2
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