diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-08-17 20:21:30 +0300 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-08-17 20:21:30 +0300 |
commit | 095fcfc4473d7bfbca878bc2947ca8dfc59e387f (patch) | |
tree | 270d8e397840c677a327823bf3c9fddff1dcc7aa /app/models/merge_request.rb | |
parent | eefb2582f45d9946de4a4b78cf8bcdc86085a1e0 (diff) | |
parent | b37c7a3a8e15e8dde2362041816cea186c8a7cfb (diff) |
Merge branch 'mc-ui'
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index d6a6a9a11ae..4304ef04767 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -701,12 +701,12 @@ class MergeRequest < ActiveRecord::Base merge_commit end - def support_new_diff_notes? + def has_complete_diff_refs? diff_sha_refs && diff_sha_refs.complete? end def update_diff_notes_positions(old_diff_refs:, new_diff_refs:) - return unless support_new_diff_notes? + return unless has_complete_diff_refs? return if new_diff_refs == old_diff_refs active_diff_notes = self.notes.diff_notes.select do |note| @@ -734,4 +734,26 @@ class MergeRequest < ActiveRecord::Base def keep_around_commit project.repository.keep_around(self.merge_commit_sha) end + + def conflicts + @conflicts ||= Gitlab::Conflict::FileCollection.new(self) + end + + def conflicts_can_be_resolved_by?(user) + access = ::Gitlab::UserAccess.new(user, project: source_project) + access.can_push_to_branch?(source_branch) + end + + def conflicts_can_be_resolved_in_ui? + return @conflicts_can_be_resolved_in_ui if defined?(@conflicts_can_be_resolved_in_ui) + + return @conflicts_can_be_resolved_in_ui = false unless cannot_be_merged? + return @conflicts_can_be_resolved_in_ui = false unless has_complete_diff_refs? + + begin + @conflicts_can_be_resolved_in_ui = conflicts.files.each(&:lines) + rescue Gitlab::Conflict::Parser::ParserError, Gitlab::Conflict::FileCollection::ConflictSideMissing + @conflicts_can_be_resolved_in_ui = false + end + end end |