Merge branch 'zj-system-notes-not-awardable' into 'master'

Award Emoji can't be awarded on system notes backend



See merge request !4668
This commit is contained in:
Douwe Maan
2016-06-15 13:51:22 +00:00
+4
View File
@@ -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