diff options
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index d77b7692d75..bd8f34e4cad 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -932,9 +932,9 @@ class Repository end end - def merge(user, merge_request, options = {}) + def merge(user, source, merge_request, options = {}) our_commit = rugged.branches[merge_request.target_branch].target - their_commit = rugged.lookup(merge_request.diff_head_sha) + their_commit = rugged.lookup(source) raise "Invalid merge target" if our_commit.nil? raise "Invalid merge source" if their_commit.nil? |