diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-12 23:37:30 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-19 10:32:41 +0300 |
| commit | fdc7d7039b83c2d9b3578338408ce28c6423a483 (patch) | |
| tree | 97377da21eda499ce8a39389bfb93cebae9292fe /app/models | |
| parent | f9a347fdcae0c4da4b2a8c3a03a7e2c6863d308d (diff) | |
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
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 3 insertions, 0 deletions
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 |