diff options
| author | haseeb <haseebeqx@yahoo.com> | 2017-08-10 20:38:24 +0530 |
|---|---|---|
| committer | haseeb <haseebeqx@yahoo.com> | 2017-08-10 20:38:24 +0530 |
| commit | f6d75f091733aa94dcfe011c374d885be4ad6c11 (patch) | |
| tree | b0cd2a89e095ed64fec396332cf3d33c50b2a705 | |
| parent | 0ff2f664256299e1d7da84632a58fd9c3a712612 (diff) | |
| download | gitlab-ce-f6d75f091733aa94dcfe011c374d885be4ad6c11.tar.gz | |
copy milestones from issue when using create merge request btn
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/create_from_issue_service.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index f4d4cca8dd8..8893a514207 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -212,7 +212,7 @@ class Projects::IssuesController < Projects::ApplicationController end def create_merge_request - result = MergeRequests::CreateFromIssueService.new(project, current_user, issue_iid: issue.iid).execute + result = ::MergeRequests::CreateFromIssueService.new(project, current_user, issue_iid: issue.iid).execute if result[:status] == :success render json: MergeRequestCreateSerializer.new.represent(result[:merge_request]) diff --git a/app/services/merge_requests/create_from_issue_service.rb b/app/services/merge_requests/create_from_issue_service.rb index 738cedbaed7..aec68c74aa6 100644 --- a/app/services/merge_requests/create_from_issue_service.rb +++ b/app/services/merge_requests/create_from_issue_service.rb @@ -43,7 +43,9 @@ module MergeRequests { source_project_id: project.id, source_branch: branch_name, - target_project_id: project.id + target_project_id: project.id, + labels: issue.labels, + milestone_id: issue.milestone_id } end |