Commit f08f921d authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Support emoji awards also in merge requests

parent 2929df3fc99e
......@@ -361,7 +361,7 @@ def editable?
# 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 @@ def set_award!
private
def issue_comment?
noteable.kind_of?(Issue)
def supports_awards?
noteable.kind_of?(Issue) ||
noteable.is_a?(MergeRequest)
end
def contains_emoji_only?
......
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