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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
4a16e892
Commit
4a16e892
authored
Apr 09, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
fbbccd5c
0ec86af8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/services/merge_requests/push_options_handler_service.rb
app/services/merge_requests/push_options_handler_service.rb
+2
-2
spec/services/merge_requests/push_options_handler_service_spec.rb
...vices/merge_requests/push_options_handler_service_spec.rb
+1
-1
No files found.
app/services/merge_requests/push_options_handler_service.rb
View file @
4a16e892
...
@@ -100,7 +100,7 @@ module MergeRequests
...
@@ -100,7 +100,7 @@ module MergeRequests
merge_request
=
::
MergeRequests
::
CreateService
.
new
(
merge_request
=
::
MergeRequests
::
CreateService
.
new
(
project
,
project
,
current_user
,
current_user
,
merge_request
.
attributes
merge_request
.
attributes
.
merge
(
assignees:
merge_request
.
assignees
)
).
execute
).
execute
end
end
...
@@ -119,7 +119,7 @@ module MergeRequests
...
@@ -119,7 +119,7 @@ module MergeRequests
def
create_params
(
branch
)
def
create_params
(
branch
)
params
=
{
params
=
{
assignee
:
current_user
,
assignee
s:
[
current_user
]
,
source_branch:
branch
,
source_branch:
branch
,
source_project:
project
,
source_project:
project
,
target_branch:
push_options
[
:target
]
||
target_project
.
default_branch
,
target_branch:
push_options
[
:target
]
||
target_project
.
default_branch
,
...
...
spec/services/merge_requests/push_options_handler_service_spec.rb
View file @
4a16e892
...
@@ -38,7 +38,7 @@ describe MergeRequests::PushOptionsHandlerService do
...
@@ -38,7 +38,7 @@ describe MergeRequests::PushOptionsHandlerService do
it
'assigns the MR to the user'
do
it
'assigns the MR to the user'
do
service
.
execute
service
.
execute
expect
(
last_mr
.
assignee
).
to
eq
(
user
)
expect
(
last_mr
.
assignee
s
).
to
contain_exactly
(
user
)
end
end
context
'when project has been forked'
do
context
'when project has been forked'
do
...
...
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