From f08f921d537c68ec0bbfb8a1ae7e905cded1bbad Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Thu, 3 Dec 2015 12:46:39 +0100
Subject: Support emoji awards also in merge requests

---
 app/models/note.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/note.rb b/app/models/note.rb
index 8acb2cf7582..30d15d93fed 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -361,7 +361,7 @@ class Note < ActiveRecord::Base
   # Method is executed as a before_validation callback.
   #
   def set_award!
-    return unless issue_comment? && contains_emoji_only?
+    return unless supports_awards? && contains_emoji_only?
 
     self.is_award = true
     self.note = award_emoji_name
@@ -369,8 +369,9 @@ class Note < ActiveRecord::Base
 
   private
 
-  def issue_comment?
-    noteable.kind_of?(Issue)
+  def supports_awards?
+    noteable.kind_of?(Issue) ||
+      noteable.is_a?(MergeRequest)
   end
 
   def contains_emoji_only?
-- 
cgit v1.2.1