diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-24 22:13:00 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-24 22:13:00 +0300 |
| commit | d41940d36ee8ff693a3c22d6c317e864b53792f0 (patch) | |
| tree | 60a0cf370682356e030eda6c6862cab3ea744ec0 /app/models/note.rb | |
| parent | 106764ab3b42f9d81a6ad81f2611ea1d78d7ae05 (diff) | |
| parent | 884498c59f7083423eac7232091ff24215f4a0c7 (diff) | |
| download | gitlab-ce-d41940d36ee8ff693a3c22d6c317e864b53792f0.tar.gz | |
Merge branch 'master' into 6-0-dev
Conflicts:
app/views/projects/issues/show.html.haml
db/fixtures/development/09_issues.rb
db/fixtures/development/10_merge_requests.rb
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index c2e664d1bcd..c23aab03bcc 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -19,6 +19,8 @@ require 'carrierwave/orm/activerecord' require 'file_size_validator' class Note < ActiveRecord::Base + include Mentionable + attr_accessible :note, :noteable, :noteable_id, :noteable_type, :project_id, :attachment, :line_code, :commit_id |