kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add fix for EE merge message

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/models/project_services/chat_message/merge_message.rb
View file

@ -48,7 +48,7 @@ module ChatMessage
end end
def merge_request_message 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 end
def merge_request_link def merge_request_link
@ -62,5 +62,10 @@ module ChatMessage
def merge_request_url def merge_request_url
"#{project_url}/merge_requests/#{merge_request_iid}" "#{project_url}/merge_requests/#{merge_request_iid}"
end end
# overridden in EE
def state_or_action_text
state
end
end end
end end

2
changelogs/unreleased/44596-double-title-merge-request-message.yml
View file

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