diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 7f3421b8e4ba9c16dd9ef8a399ffef693427ec9f..c05f59bfbea47983d1c77862ceb61b7a5cea34dd 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -8,6 +8,8 @@ module MergeRequests def execute_hooks(merge_request) if merge_request.project hook_data = merge_request.to_hook_data(current_user) + url = Gitlab::UrlBuilder.new(:merge_request).build(merge_request.id) + hook_data[:object_attributes].merge!(url: url) merge_request.project.execute_hooks(hook_data, :merge_request_hooks) end end diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md index f19517c0f18a5ab1925264ff2b72e396a4a821e7..81ad5e92595eb123cc89d6475ca31fb0a144c57c 100644 --- a/doc/web_hooks/web_hooks.md +++ b/doc/web_hooks/web_hooks.md @@ -119,6 +119,7 @@ Triggered when a new merge request is created or an existing merge request was u "merge_status": "unchecked", "target_project_id": 14, "iid": 1, + "url": "http://example.com/awesome_space/awesome_project/merge_requests/1", "description": "", "source": { "name": "awesome_project", diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb index 877488d847174ef3a59ee91493f41a3006eb108d..25f310a9b63c7e893cfdad8f2ab4ad279827c30b 100644 --- a/lib/gitlab/url_builder.rb +++ b/lib/gitlab/url_builder.rb @@ -10,6 +10,8 @@ module Gitlab case @type when :issue issue_url(id) + when :merge_request + merge_request_url(id) end end @@ -21,5 +23,12 @@ module Gitlab project_id: issue.project, host: Gitlab.config.gitlab['url']) end + + def merge_request_url(id) + merge_request = MergeRequest.find(id) + project_merge_request_url(id: merge_request.iid, + project_id: merge_request.project, + host: Gitlab.config.gitlab['url']) + end end end diff --git a/spec/lib/gitlab/url_builder_spec.rb b/spec/lib/gitlab/url_builder_spec.rb index eb47bee8336b6141c84c4eb4a99e37c779fce225..afa0464ff24ccf5e055830e6b8e58ca4e5430155 100644 --- a/spec/lib/gitlab/url_builder_spec.rb +++ b/spec/lib/gitlab/url_builder_spec.rb @@ -8,4 +8,13 @@ describe Gitlab::UrlBuilder do expect(url).to eq "#{Settings.gitlab['url']}/#{issue.project.to_param}/issues/#{issue.iid}" end end + + describe 'When asking for a merge request' do + it 'returns the merge request url' do + merge_request = create(:merge_request) + url = Gitlab::UrlBuilder.new(:merge_request).build(merge_request.id) + expect(url).to eq Settings.gitlab['url'] + + "/#{merge_request.project.to_param}/merge_requests/#{merge_request.iid}" + end + end end