diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-07 11:29:29 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-07 11:29:29 -0500 |
| commit | 8c161d7bbefeff38b4927dff94e89dda6453c6a7 (patch) | |
| tree | 426a9d5696844ea81be16f60ce2c9d2c8053871a /app/models/note.rb | |
| parent | d80f903673ed246e2d0687728cbde31463d5b2ad (diff) | |
| download | gitlab-ce-8c161d7bbefeff38b4927dff94e89dda6453c6a7.tar.gz | |
Fix bug where commit comment would not show up in the right discussion on the MR page
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 401e3d7bcbc..1ea7b946061 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -102,8 +102,8 @@ class Note < ActiveRecord::Base ActiveModel::Name.new(self, nil, 'note') end - def discussions(noteable = nil) - Discussion.build_collection(fresh, noteable) + def discussions(context_noteable = nil) + Discussion.build_collection(fresh, context_noteable) end def find_discussion(discussion_id) |