diff options
| author | ZJ van de Weg <zegerjan@gitlab.com> | 2016-05-19 15:00:50 -0500 |
|---|---|---|
| committer | ZJ van de Weg <zegerjan@gitlab.com> | 2016-05-19 15:00:50 -0500 |
| commit | 4d6c51e2282c6416a8766fdf580a19fd08670609 (patch) | |
| tree | 055a52e8bfa2cbda85a73d3eb2f25edcaa5ad658 /app/models/note.rb | |
| parent | b40afae62c6df741d4b458289c3d44af5a43ca4e (diff) | |
| download | gitlab-ce-4d6c51e2282c6416a8766fdf580a19fd08670609.tar.gz | |
Fix backend merge mistakes
[ci skip]
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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? |