summaryrefslogtreecommitdiff
path: root/app/models/diff_note.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-06-20 19:22:08 +0200
committerDouwe Maan <douwe@selenight.nl>2016-07-06 18:51:00 -0400
commit8d7dc26d39b65b3ef6e8ec80ed5995ae307c3d3c (patch)
tree85102d61cdc137e87e3f7edc5caf866750075971 /app/models/diff_note.rb
parent2f30d00432e9727581e814062ea6117e1946a981 (diff)
downloadgitlab-ce-8d7dc26d39b65b3ef6e8ec80ed5995ae307c3d3c.tar.gz
Support new diff notes on MRs with diff_refs
Diffstat (limited to 'app/models/diff_note.rb')
-rw-r--r--app/models/diff_note.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb
index 94c07cc535c..70fbcb4c4e9 100644
--- a/app/models/diff_note.rb
+++ b/app/models/diff_note.rb
@@ -74,7 +74,7 @@ class DiffNote < Note
private
def supported?
- !self.for_merge_request?
+ !self.for_merge_request? || self.noteable.support_new_diff_notes?
end
def set_original_position