diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-21 14:01:13 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-21 14:01:13 +0300 |
| commit | f474f5d48ff7ca1184c09bb1cc265fd37602a232 (patch) | |
| tree | 1d98a3aed493df52da7afd41b42e660d4cb66a9c /app/models/note.rb | |
| parent | 37037b70b83c493d2fa4a9315964028e193d0b58 (diff) | |
| parent | e8a6495b6687f37680d371d942f5700f9db0956c (diff) | |
Merge branch 'ce_stabe_updates' into '7-13-stable'
Updates for 7.13 stable (RC4)
See merge request !1012
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 62567f471dc..2362e50276e 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -31,7 +31,7 @@ class Note < ActiveRecord::Base participant :author, :mentioned_users belongs_to :project - belongs_to :noteable, polymorphic: true, touch: true + belongs_to :noteable, polymorphic: true belongs_to :author, class_name: "User" delegate :name, to: :project, prefix: true |