Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
a115267e
Commit
a115267e
authored
Aug 10, 2017
by
haseeb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
working version of create merge requests with labels
parent
f6d75f09
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+11
-1
app/services/merge_requests/create_from_issue_service.rb
app/services/merge_requests/create_from_issue_service.rb
+1
-3
No files found.
app/controllers/projects/issues_controller.rb
View file @
a115267e
...
...
@@ -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
,
merge_request_params
).
execute
if
result
[
:status
]
==
:success
render
json:
MergeRequestCreateSerializer
.
new
.
represent
(
result
[
:merge_request
])
...
...
@@ -287,4 +287,14 @@ class Projects::IssuesController < Projects::ApplicationController
redirect_to
new_user_session_path
,
notice:
notice
end
private
def
merge_request_params
{
issue_iid:
issue
.
iid
,
label_ids:
issue
.
label_ids
,
milestone_id:
issue
.
milestone_id
}
end
end
app/services/merge_requests/create_from_issue_service.rb
View file @
a115267e
...
...
@@ -43,9 +43,7 @@ module MergeRequests
{
source_project_id:
project
.
id
,
source_branch:
branch_name
,
target_project_id:
project
.
id
,
labels:
issue
.
labels
,
milestone_id:
issue
.
milestone_id
target_project_id:
project
.
id
}
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment