diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-12-29 16:07:12 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-12-29 16:07:12 +0000 |
| commit | eeba266e3d45f2e82f84bd3aab85195c890efb89 (patch) | |
| tree | e3c9d0c6e323f3ba051ec7209f0542e1d1581cab /app/models/concerns | |
| parent | a12517466b13150cc6631018b9a7e91ea534e3d9 (diff) | |
| parent | d3807328d8ed9be2915f67708b093269bf0b1b9f (diff) | |
| download | gitlab-ce-eeba266e3d45f2e82f84bd3aab85195c890efb89.tar.gz | |
Merge branch 'upvote_count_to_api' into 'master'
Revert upvotes and downvotes params back to MR API
issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672
See merge request !2212
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/issuable.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 919833f6df5..18a00f95b48 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -95,14 +95,12 @@ module Issuable opened? || reopened? end - # Deprecated. Still exists to preserve API compatibility. def downvotes - 0 + notes.awards.where(note: "thumbsdown").count end - # Deprecated. Still exists to preserve API compatibility. def upvotes - 0 + notes.awards.where(note: "thumbsup").count end def subscribed?(user) |