diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-15 13:51:22 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-15 13:51:22 +0000 |
| commit | 84138691a36eea2186db48d5dbcacb4d8a7e697c (patch) | |
| tree | 1f365b36d4eeffc6607e531a6d66abdbacd533ed /app | |
| parent | be098459147f0cd4323db7e0cca44160b5236ff4 (diff) | |
| parent | 31944179aac2c0c0dcb932b73e69421da4fa2ff8 (diff) | |
| download | gitlab-ce-84138691a36eea2186db48d5dbcacb4d8a7e697c.tar.gz | |
Merge branch 'zj-system-notes-not-awardable' into 'master'
Award Emoji can't be awarded on system notes backend
See merge request !4668
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/note.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 58133f1581f..4b6748053ff 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -187,6 +187,10 @@ class Note < ActiveRecord::Base award_emoji_supported? && contains_emoji_only? end + def emoji_awardable? + !system? + end + def clear_blank_line_code! self.line_code = nil if self.line_code.blank? end |