Commit 3174b080 authored by Kukovskii Vladimir's avatar Kukovskii Vladimir

Add fix for EE merge message

parent 289aecb0
......@@ -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
---
title: Fix double title in merge request chat messages.
merge_request:
merge_request: 21670
author: Kukovskii Vladimir
type: fixed
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment