summaryrefslogtreecommitdiff
path: root/app/models/note.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/note.rb')
-rw-r--r--app/models/note.rb4
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)