diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 00:08:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 00:08:46 +0000 |
| commit | 6755df108b123ecc8ae330d7c7bf2f04fbf36a81 (patch) | |
| tree | 7609bd6c0a9ac607d8f57737a2c27a460b7fcfdd /app/models/project_services | |
| parent | ee7fba4b844935437233f6c5b74545a28bac4298 (diff) | |
| download | gitlab-ce-6755df108b123ecc8ae330d7c7bf2f04fbf36a81.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/project_services')
| -rw-r--r-- | app/models/project_services/chat_message/merge_message.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/hipchat_service.rb | 2 |
2 files changed, 2 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 46313ba7bec..dc62a4c8908 100644 --- a/app/models/project_services/chat_message/merge_message.rb +++ b/app/models/project_services/chat_message/merge_message.rb @@ -62,7 +62,7 @@ module ChatMessage end def merge_request_url - "#{project_url}/merge_requests/#{merge_request_iid}" + "#{project_url}/-/merge_requests/#{merge_request_iid}" end # overridden in EE diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb index 019bd54f48c..c92e8ecb31c 100644 --- a/app/models/project_services/hipchat_service.rb +++ b/app/models/project_services/hipchat_service.rb @@ -184,7 +184,7 @@ class HipchatService < Service description = obj_attr[:description] title = render_line(obj_attr[:title]) - merge_request_url = "#{project_url}/merge_requests/#{merge_request_id}" + merge_request_url = "#{project_url}/-/merge_requests/#{merge_request_id}" merge_request_link = "<a href=\"#{merge_request_url}\">merge request !#{merge_request_id}</a>" message = ["#{user_name} #{state} #{merge_request_link} in " \ "#{project_link}: <b>#{title}</b>"] |