kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into 'master'

Browse source 
Add time tracking to issue board entities

Closes #27780

See merge request gitlab-org/gitlab-ce!26850
This commit is contained in:
James Lopez 2019-04-10 11:00:42 +00:00
commit 2238b12df9
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/serializers/issue_board_entity.rb
View file

@ -2,6 +2,7 @@
class IssueBoardEntity < Grape::Entity
include RequestAwareEntity
include TimeTrackableEntity
expose :id
expose :iid

3
spec/fixtures/api/schemas/entities/issue_board.json vendored
View file

@ -9,6 +9,9 @@
"project_id": { "type": "integer" },
"relative_position": { "type": ["integer", "null"] },
"time_estimate": { "type": "integer" },
"total_time_spent": { "type": "integer" },
"human_time_estimate": { "type": ["string", "null"] },
"human_total_time_spent": { "type": ["string", "null"] },
"weight": { "type": ["integer", "null"] },
"project": {
"type": "object",