Fix vote counting

1 files changed, 14 insertions, 2 deletions

diff --git a/app/models/note.rb b/app/models/note.rb
index a7bde1c5d8c..17b76615fa2 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -85,7 +85,9 @@ class Note < ActiveRecord::Base
   # Returns true if this is a downvote note,
   # otherwise false is returned
   def downvote?
-    note.start_with?('-1') || note.start_with?(':-1:')
+    votable? && (note.start_with?('-1') ||
+                 note.start_with?(':-1:')
+                )
   end
 
   def for_commit?
@@ -100,6 +102,10 @@ class Note < ActiveRecord::Base
     line_code.present?
   end
 
+  def for_issue?
+    noteable_type == "Issue"
+  end
+
   def for_merge_request?
     noteable_type == "MergeRequest"
   end
@@ -150,6 +156,12 @@ class Note < ActiveRecord::Base
   # Returns true if this is an upvote note,
   # otherwise false is returned
   def upvote?
-    note.start_with?('+1') || note.start_with?(':+1:')
+    votable? && (note.start_with?('+1') ||
+                 note.start_with?(':+1:')
+                )
+  end
+
+  def votable?
+    for_issue? || (for_merge_request? && !for_diff_line?)
   end
 end