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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index f8511ac5f5c..26e7c956e8f 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -166,7 +166,6 @@ module API class MergeRequest < ProjectEntity expose :target_branch, :source_branch - # deprecated, always returns 0 expose :upvotes, :downvotes expose :author, :assignee, using: Entities::UserBasic expose :source_project_id, :target_project_id |