diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 10:48:02 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 10:48:02 +0200 |
| commit | 32046983ad0a702b9c091d052859a13660497dcd (patch) | |
| tree | 60e8fb8155c1ea9f17056c071b38130c6657b176 /app/models/merge_request.rb | |
| parent | 9f10943c1a76576ac40d96189a28a4d6123a75d8 (diff) | |
| download | gitlab-ce-32046983ad0a702b9c091d052859a13660497dcd.tar.gz | |
Revert "Merge branch 'refactor-can-be-merge' into 'master'"
This reverts commit 459e6d346768d9d8fceaee00bf0870b8e7c4ed9a, reversing
changes made to 804168e1def1204af712febb229f41a3865f085f.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 1ef76d16700..5a48fe66281 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -209,7 +209,13 @@ class MergeRequest < ActiveRecord::Base if for_fork? Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged? else - project.repository.can_be_merged?(source_branch, target_branch) + rugged = project.repository.rugged + our_commit = rugged.branches[target_branch].target + their_commit = rugged.branches[source_branch].target + + if our_commit && their_commit + !rugged.merge_commits(our_commit, their_commit).conflicts? + end end if can_be_merged |