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
d779f67c
Commit
d779f67c
authored
Feb 03, 2017
by
Lin Jen-Shin
Committed by
Douwe Maan
Feb 02, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use GitOperationService instead
parent
9c4f82ab
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
app/models/repository.rb
app/models/repository.rb
+6
-2
No files found.
app/models/repository.rb
View file @
d779f67c
...
@@ -1002,8 +1002,12 @@ class Repository
...
@@ -1002,8 +1002,12 @@ class Repository
raise
"Invalid merge target"
if
our_commit
.
nil?
raise
"Invalid merge target"
if
our_commit
.
nil?
raise
"Invalid merge source"
if
their_commit
.
nil?
raise
"Invalid merge source"
if
their_commit
.
nil?
update_branch_with_hooks
(
user
,
target_branch
)
do
GitOperationService
.
new
(
user
,
self
).
with_branch
(
merge_request
.
update
(
in_progress_merge_commit_sha:
their_commit
.
oid
)
if
merge_request
target_branch
)
do
|
start_commit
|
if
merge_request
merge_request
.
update
(
in_progress_merge_commit_sha:
their_commit
.
oid
)
end
their_commit
.
oid
their_commit
.
oid
end
end
end
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