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:
-rw-r--r--app/models/note.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb
index 2c9980b1a0d..7f6d5439121 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -358,7 +358,7 @@ class Note < ActiveRecord::Base
# When commit notes are rendered on an MR's Discussion page, they are
# displayed in one discussion instead of individually.
# See also `#discussion_id` and `Discussion.override_discussion_id`.
- if noteable && noteable != self.noteable
+ if noteable && noteable != self.noteable && !system?
OutOfContextDiscussion
else
IndividualNoteDiscussion