From fdc7d7039b83c2d9b3578338408ce28c6423a483 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 12 May 2017 20:37:30 +0000 Subject: Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298 Conflicts: app/models/merge_request.rb spec/models/merge_request_spec.rb --- app/models/merge_request.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/models') diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index e88a86ea0f0..417a13da812 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -905,6 +905,7 @@ class MergeRequest < ActiveRecord::Base project.repository.keep_around(self.merge_commit_sha) end +<<<<<<< HEAD def conflicts @conflicts ||= Gitlab::Conflict::FileCollection.new(self) end @@ -934,6 +935,8 @@ class MergeRequest < ActiveRecord::Base end end +======= +>>>>>>> e4261fe3... Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' def has_commits? merge_request_diff && commits_count > 0 end -- cgit v1.2.3