diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-06 16:48:35 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-06 16:48:35 +0000 |
| commit | 4d4a9b7c8a62b720e573a2bec67407acc455531a (patch) | |
| tree | 2a05d52a8e0c3b13adbe8dbaa8fa33f9faff2e62 /app/models | |
| parent | ac4e3e8cf016f2c2b3dcf3997673310a5df658a9 (diff) | |
| parent | 8dc1fa0d8dc9106ab95a3039723e9013c4eed00c (diff) | |
| download | gitlab-ce-4d4a9b7c8a62b720e573a2bec67407acc455531a.tar.gz | |
Merge branch 'notes-are-awardables' into 'master'
Notes are awardables
## What does this MR do?
Makes sure we can :thunder_cloud_rain: comments/notes.
## What are the relevant issue numbers?
Follows up upon !2901, depends on !3785
Closes #3655
## Screenshots (if relevant)
TODO
See merge request !4291
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/note.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 46c3f6e24af..585d8c4ad84 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -3,6 +3,7 @@ class Note < ActiveRecord::Base include Gitlab::CurrentSettings include Participable include Mentionable + include Awardable default_value_for :system, false |