diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-08-17 12:29:05 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-08-17 12:29:05 -0600 |
| commit | 2df34c20cb3d0346f5bb53b995d41a8c36ad71cb (patch) | |
| tree | 6ea133ebd7ac11b8afab3730a66eb680e76a5f9d /app/models/diff_note.rb | |
| parent | c648756a36a7ee64fa63bcf4782126503474213d (diff) | |
| download | gitlab-ce-2df34c20cb3d0346f5bb53b995d41a8c36ad71cb.tar.gz | |
Fix a lingering conflict.
Diffstat (limited to 'app/models/diff_note.rb')
| -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 |