diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-18 12:23:44 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-18 12:23:44 +0100 |
| commit | a1deb6ece3be68fb176eb08a6371a334b24b4f01 (patch) | |
| tree | 7b5c300c34507efa05a885a6a51f3924b508dc52 /app/models/merge_request.rb | |
| parent | da07c2e4d3d382c05ec287ee60f639b870074fe7 (diff) | |
| parent | c9d7ba4d696bfd0198ac75db6e1b2a08b4517f82 (diff) | |
| download | gitlab-ce-a1deb6ece3be68fb176eb08a6371a334b24b4f01.tar.gz | |
Merge branch 'master' into issue_19734_2
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 5ccfe11a2a2..8c6905a442d 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -871,7 +871,7 @@ class MergeRequest < ActiveRecord::Base # files. conflicts.files.each(&:lines) @conflicts_can_be_resolved_in_ui = conflicts.files.length > 0 - rescue Rugged::OdbError, Gitlab::Conflict::Parser::ParserError, Gitlab::Conflict::FileCollection::ConflictSideMissing + rescue Rugged::OdbError, Gitlab::Conflict::Parser::UnresolvableError, Gitlab::Conflict::FileCollection::ConflictSideMissing @conflicts_can_be_resolved_in_ui = false end end |