diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-30 00:19:42 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-30 00:19:42 +0300 |
| commit | 45b61a9ece48550f51432c8cca7de7e1a298ca08 (patch) | |
| tree | b305158d82f83dc16203490ed03e7103d7e523d3 /app/services | |
| parent | e4e40b963226099ba76718b692c6c944336c7f5c (diff) | |
| parent | 72ff187c36bc73bddb349269f08f8fb46eab2676 (diff) | |
Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'
Make new merge request URL more friendly when pushing code
Closes #53012
See merge request gitlab-org/gitlab-ce!22526
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/get_urls_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/get_urls_service.rb b/app/services/merge_requests/get_urls_service.rb index 7c88c9abb41..35a22449e34 100644 --- a/app/services/merge_requests/get_urls_service.rb +++ b/app/services/merge_requests/get_urls_service.rb @@ -50,8 +50,8 @@ module MergeRequests end def url_for_new_merge_request(branch_name) - merge_request_params = { source_branch: branch_name } - url = Gitlab::Routing.url_helpers.project_new_merge_request_url(project, merge_request: merge_request_params) + url = Gitlab::Routing.url_helpers.project_new_merge_request_url(project, branch_name) + { branch_name: branch_name, url: url, new_merge_request: true } end |