Commit 84138691 authored by Douwe Maan's avatar Douwe Maan

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

Award Emoji can't be awarded on system notes backend



See merge request !4668
parents be098459 31944179
...@@ -187,6 +187,10 @@ class Note < ActiveRecord::Base ...@@ -187,6 +187,10 @@ class Note < ActiveRecord::Base
award_emoji_supported? && contains_emoji_only? award_emoji_supported? && contains_emoji_only?
end end
def emoji_awardable?
!system?
end
def clear_blank_line_code! def clear_blank_line_code!
self.line_code = nil if self.line_code.blank? self.line_code = nil if self.line_code.blank?
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment