Add fix for EE merge message

This commit is contained in:
Kukovskii Vladimir 2018-09-14 18:22:10 +09:00
parent 289aecb08d
commit 3174b080c3
2 changed files with 7 additions and 2 deletions

View File

@ -48,7 +48,7 @@ module ChatMessage
end
def merge_request_message
"#{user_combined_name} #{state} #{merge_request_link} in #{project_link}"
"#{user_combined_name} #{state_or_action_text} #{merge_request_link} in #{project_link}"
end
def merge_request_link
@ -62,5 +62,10 @@ module ChatMessage
def merge_request_url
"#{project_url}/merge_requests/#{merge_request_iid}"
end
# overridden in EE
def state_or_action_text
state
end
end
end

View File

@ -1,5 +1,5 @@
---
title: Fix double title in merge request chat messages.
merge_request:
merge_request: 21670
author: Kukovskii Vladimir
type: fixed