Merge branch 'fix-award-emoji-api' into 'master'

Add upvote/downvote fields to merge request and note API to preserve compatibility

As discussed in !1825 we should not break the API compatibility.

* This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`.
* Add the fields `upvote`/`downvote` to the notes API, which always return `false`

This behavior is documented in the API docs.

See merge request !1867

2 files changed, 20 insertions, 0 deletions

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 2dafb5e752f..98ad5e76da7 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -92,6 +92,16 @@ module Issuable
     opened? || reopened?
   end
 
+  # Deprecated. Still exists to preserve API compatibility.
+  def downvotes
+    0
+  end
+
+  # Deprecated. Still exists to preserve API compatibility.
+  def upvotes
+    0
+  end
+
   def subscribed?(user)
     subscription = subscriptions.find_by_user_id(user.id)
 
diff --git a/app/models/note.rb b/app/models/note.rb
index e30be444eb5..1c6345e735c 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -335,6 +335,16 @@ class Note < ActiveRecord::Base
     read_attribute(:system)
   end
 
+  # Deprecated. Still exists to preserve API compatibility.
+  def downvote?
+    false
+  end
+
+  # Deprecated. Still exists to preserve API compatibility.
+  def upvote?
+    false
+  end
+
   def editable?
     !system?
   end