diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-17 14:22:05 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-17 14:22:05 +0300 |
commit | 983bd38f9189a5c7c470f76f7a83044ec7259d21 (patch) | |
tree | 3b627b240be382af1d9358ebacc0719e2d8d084d /app/models/project_services | |
parent | dd0f3b90407cf38f31b1e28efaa19703b8d01984 (diff) | |
parent | 3174b080c3a651f7e17485532a14573c2ae8422f (diff) |
Merge branch '44596-double-title-merge-request-message' into 'master'
Fix double title in merge request chat messages
Closes #44586
See merge request gitlab-org/gitlab-ce!21670
Diffstat (limited to 'app/models/project_services')
-rw-r--r-- | app/models/project_services/chat_message/merge_message.rb | 7 |
1 files changed, 6 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 58631e09538..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}: #{title}" + "#{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 |