diff options
| -rw-r--r-- | app/models/diff_note.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index ed091b34925..1ca37c4a5bf 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -109,11 +109,7 @@ 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 + for_commit? || self.noteable.has_complete_diff_refs? end def noteable_diff_refs |