diff options
Diffstat (limited to 'app/models/diff_note.rb')
| -rw-r--r-- | app/models/diff_note.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index 1313739f322..ed091b34925 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -109,7 +109,11 @@ class DiffNote < Note private def supported? +<<<<<<< HEAD for_commit? || self.noteable.support_new_diff_notes? +======= + !self.for_merge_request? || self.noteable.has_complete_diff_refs? +>>>>>>> master end def noteable_diff_refs |