diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-04 10:31:44 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:48 +0300 |
| commit | 427e724698185169536d68e95873415038286849 (patch) | |
| tree | 8a114686469f751c6aef02361b8a83fa344f1f54 /app/models/diff_note.rb | |
| parent | 5277239c3e2d843f04397dce572a647f3bd79bdf (diff) | |
| download | gitlab-ce-427e724698185169536d68e95873415038286849.tar.gz | |
Don't allow resolving invalid conflicts
An MR can only be resolved in the UI if:
- It has conflicts.
- It has valid diff_refs (in other words, it supports new diff notes).
- It has no conflicts with one side missing.
- It has no conflicts in binary files.
- It has no conflicts in files too large to display.
- It has no conflicts containing invalid conflict markers.
Diffstat (limited to 'app/models/diff_note.rb')
| -rw-r--r-- | app/models/diff_note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index c816deb4e0c..e02a3d54c36 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -75,7 +75,7 @@ class DiffNote < Note private def supported? - !self.for_merge_request? || self.noteable.support_new_diff_notes? + !self.for_merge_request? || self.noteable.has_complete_diff_refs? end def noteable_diff_refs |