diff options
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 157901378d3..d3a611414cb 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -321,6 +321,18 @@ class MergeRequest < ActiveRecord::Base end end + def conflicts? + project.repository.conflicts?(diff_head_sha, target_branch) + end + + def conflicts + project.repository.conflicts(diff_head_sha, target_branch) + end + + def conflict_diff(conflict) + project.repository.conflict_diff(diff_head_sha, target_branch, conflict[:ancestor][:path]) + end + def merge_event @merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last end |