diff options
author | Rémy Coutable <remy@rymai.me> | 2016-04-12 09:21:00 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-04-12 09:21:00 +0000 |
commit | 8cb41f19891e4f39c64abd6b2a273625103c5f43 (patch) | |
tree | 158607d156288c6f151eedbdd49f4b7cb84530d6 | |
parent | 0913204f9b1db46afca939c5f963e5dc12614641 (diff) | |
parent | 5083e5b616d2ba9b2812920c8d6cf3e0f95389e1 (diff) | |
download | gitlab-ce-8cb41f19891e4f39c64abd6b2a273625103c5f43.tar.gz |
Merge branch 'api-labels-info' into 'master'
API: Expose open_issues_count, closed_issues_count, open_merge_requests_count on labels
Partly fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13238
See merge request !3569
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | doc/api/labels.md | 40 | ||||
-rw-r--r-- | lib/api/entities.rb | 1 |
3 files changed, 22 insertions, 20 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3561c541df0..c08b148c3ac 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,7 @@ v 8.7.0 (unreleased) - Add endpoints to archive or unarchive a project !3372 - Add links to CI setup documentation from project settings and builds pages - Handle nil descriptions in Slack issue messages (Stan Hu) + - API: Expose open_issues_count, closed_issues_count, open_merge_requests_count for labels (Robert Schilling) - Add default scope to projects to exclude projects pending deletion - Ensure empty recipients are rejected in BuildsEmailService - API: Ability to filter milestones by state `active` and `closed` (Robert Schilling) diff --git a/doc/api/labels.md b/doc/api/labels.md index 544e898b6aa..3730c07c5a7 100644 --- a/doc/api/labels.md +++ b/doc/api/labels.md @@ -23,42 +23,42 @@ Example response: { "name" : "bug", "color" : "#d9534f", - "description": "Bug reported by user" + "description": "Bug reported by user", + "open_issues_count": 1, + "closed_issues_count": 0, + "open_merge_requests_count": 1 }, { "color" : "#d9534f", "name" : "confirmed", - "description": "Confirmed issue" + "description": "Confirmed issue", + "open_issues_count": 2, + "closed_issues_count": 5, + "open_merge_requests_count": 0 }, { "name" : "critical", "color" : "#d9534f", - "description": "Criticalissue. Need fix ASAP" - }, - { - "color" : "#428bca", - "name" : "discussion", - "description": "Issue that needs further discussion" + "description": "Criticalissue. Need fix ASAP", + "open_issues_count": 1, + "closed_issues_count": 3, + "open_merge_requests_count": 1 }, { "name" : "documentation", "color" : "#f0ad4e", - "description": "Issue about documentation" + "description": "Issue about documentation", + "open_issues_count": 1, + "closed_issues_count": 0, + "open_merge_requests_count": 2 }, { "color" : "#5cb85c", "name" : "enhancement", - "description": "Enhancement proposal" - }, - { - "color" : "#428bca", - "name" : "suggestion", - "description": "Suggestion" - }, - { - "color" : "#f0ad4e", - "name" : "support", - "description": "Support issue" + "description": "Enhancement proposal", + "open_issues_count": 1, + "closed_issues_count": 0, + "open_merge_requests_count": 1 } ] ``` diff --git a/lib/api/entities.rb b/lib/api/entities.rb index d76b46b8836..5ed9b7b1d9f 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -301,6 +301,7 @@ module API class Label < Grape::Entity expose :name, :color, :description + expose :open_issues_count, :closed_issues_count, :open_merge_requests_count end class Compare < Grape::Entity |