From 4d6c51e2282c6416a8766fdf580a19fd08670609 Mon Sep 17 00:00:00 2001 From: ZJ van de Weg Date: Thu, 19 May 2016 15:00:50 -0500 Subject: Fix backend merge mistakes [ci skip] --- app/models/note.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/note.rb b/app/models/note.rb index e9bef4fb9fe..2b1a3f90697 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -193,7 +193,7 @@ class Note < ActiveRecord::Base end def award_emoji_supported? - noteable.is_a?(Awardable) && !for_diff_line? + noteable.is_a?(Awardable) && !line_code.present? end def contains_emoji_only? -- cgit v1.2.1