diff options
| author | Kukovskii Vladimir <ura@dgtakano.co.jp> | 2018-09-14 18:22:10 +0900 |
|---|---|---|
| committer | Kukovskii Vladimir <ura@dgtakano.co.jp> | 2018-09-14 18:22:10 +0900 |
| commit | 3174b080c3a651f7e17485532a14573c2ae8422f (patch) | |
| tree | d316d8c1c132797e908f903d01046727e9e38500 | |
| parent | 289aecb08d7f392161cc44232d111d9c40a9d032 (diff) | |
| download | gitlab-ce-3174b080c3a651f7e17485532a14573c2ae8422f.tar.gz | |
Add fix for EE merge message
| -rw-r--r-- | app/models/project_services/chat_message/merge_message.rb | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/44596-double-title-merge-request-message.yml | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/models/project_services/chat_message/merge_message.rb b/app/models/project_services/chat_message/merge_message.rb index bf5a4d153cb..cc88d57faf8 100644 --- a/app/models/project_services/chat_message/merge_message.rb +++ b/app/models/project_services/chat_message/merge_message.rb @@ -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 diff --git a/changelogs/unreleased/44596-double-title-merge-request-message.yml b/changelogs/unreleased/44596-double-title-merge-request-message.yml index 8f8f12bf972..714d16977fb 100644 --- a/changelogs/unreleased/44596-double-title-merge-request-message.yml +++ b/changelogs/unreleased/44596-double-title-merge-request-message.yml @@ -1,5 +1,5 @@ --- title: Fix double title in merge request chat messages. -merge_request: +merge_request: 21670 author: Kukovskii Vladimir type: fixed |