summaryrefslogtreecommitdiff
path: root/app/models/note.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-14 16:20:11 +0200
committerDouwe Maan <douwe@gitlab.com>2015-10-14 16:20:11 +0200
commit4a5b77188ec7525d1c3a1ee925c8791f841b040c (patch)
treec691a9271c6c4229db9893c34880abfccefbe95a /app/models/note.rb
parent61d8f9617681973f04d264762b54840d44dea02a (diff)
downloadgitlab-ce-4a5b77188ec7525d1c3a1ee925c8791f841b040c.tar.gz
Participable doesn't need to know about Mentionable
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 de3b6df88f7..2fbe4784159 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -22,14 +22,14 @@ require 'carrierwave/orm/activerecord'
require 'file_size_validator'
class Note < ActiveRecord::Base
- include Mentionable
include Gitlab::CurrentSettings
include Participable
+ include Mentionable
default_value_for :system, false
attr_mentionable :note
- participant :author, :mentioned_users
+ participant :author
belongs_to :project
belongs_to :noteable, polymorphic: true