diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-06-14 09:06:53 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-06-14 09:06:53 +0530 |
| commit | d0bcba1105686c2306414a402bf33c85a08a17a6 (patch) | |
| tree | 2922086316008cf86e864e1dd8a251fd4878cb04 /lib/api/entities.rb | |
| parent | d754d99179f1ffe846fcc1d8e858163b39efc5dc (diff) | |
| parent | f34af6b83cc2663bb8a076f4df9c82047e5511ab (diff) | |
| download | gitlab-ce-d0bcba1105686c2306414a402bf33c85a08a17a6.tar.gz | |
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 50d69274b2e..14370ac218d 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -179,6 +179,11 @@ module API expose :upvotes, :downvotes end + class ExternalIssue < Grape::Entity + expose :title + expose :id + end + class MergeRequest < ProjectEntity expose :target_branch, :source_branch expose :upvotes, :downvotes |