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:
authorDouwe Maan <douwe@selenight.nl>2017-04-24 20:24:34 +0300
committerDouwe Maan <douwe@selenight.nl>2017-04-24 20:24:39 +0300
commitbc4eeb96ae5c7de96f7e8e16aa508e3308f06c5b (patch)
treecd2aeeb688c93e4c3556f2c20e23e2074c76777a /app/models/out_of_context_discussion.rb
parent1005389f70070245092c1ae5f3f9b10b8e7c102e (diff)
Ensure replying to an individual note by email creates a note with its own discussion ID
Diffstat (limited to 'app/models/out_of_context_discussion.rb')
-rw-r--r--app/models/out_of_context_discussion.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/out_of_context_discussion.rb b/app/models/out_of_context_discussion.rb
index 85794630f70..4227c40b69a 100644
--- a/app/models/out_of_context_discussion.rb
+++ b/app/models/out_of_context_discussion.rb
@@ -15,8 +15,12 @@ class OutOfContextDiscussion < Discussion
def self.override_discussion_id(note)
discussion_id(note)
end
-
+
def self.note_class
Note
end
+
+ def reply_attributes
+ super.tap { |attrs| attrs.delete(:discussion_id) }
+ end
end