Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 12:06:16 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 12:06:16 +0300
commita048261403ea7e12992ccffe704f0779235712d7 (patch)
tree59254549db6d39a4da824379a7bf354e7c8e7e67 /app/models/diff_note.rb
parent80e5134020483299c039114e76b734436f006c66 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/diff_note.rb')
-rw-r--r--app/models/diff_note.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb
index 65e87bb08a7..0623ba746c2 100644
--- a/app/models/diff_note.rb
+++ b/app/models/diff_note.rb
@@ -88,10 +88,6 @@ class DiffNote < Note
line&.suggestible?
end
- def discussion_first_note?
- self == discussion.first_note
- end
-
def banzai_render_context(field)
super.merge(suggestions_filter_enabled: true)
end
@@ -108,7 +104,7 @@ class DiffNote < Note
end
def should_create_diff_file?
- on_text? && note_diff_file.nil? && discussion_first_note?
+ on_text? && note_diff_file.nil? && start_of_discussion?
end
def fetch_diff_file