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

Award Emoji can't be awarded on system notes backend See merge request !4668

Merge branch 'zj-system-notes-not-awardable' into 'master'
84138691 · Douwe Maan · be098459 · 31944179 · 84138691
Commit 84138691 authored Jun 15, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

note.rb app/models/note.rb +4 -0

No files found.
--- 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