summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpataar <pietering1@gmail.com>2019-04-10 11:00:41 +0000
committerJames Lopez <james@gitlab.com>2019-04-10 11:00:41 +0000
commita2d34fbfbe0ba1772359d4c62b93cb90a4d752b4 (patch)
tree7033dadffaae43e74ac3c0ae06c1e1c8fc211050
parentcd566c2622984a66e93b1536954464cab5628bcc (diff)
downloadgitlab-ce-a2d34fbfbe0ba1772359d4c62b93cb90a4d752b4.tar.gz
Add time tracking to issue board entities
-rw-r--r--app/serializers/issue_board_entity.rb1
-rw-r--r--spec/fixtures/api/schemas/entities/issue_board.json3
2 files changed, 4 insertions, 0 deletions
diff --git a/app/serializers/issue_board_entity.rb b/app/serializers/issue_board_entity.rb
index f7719447b92..e0041eff6cc 100644
--- a/app/serializers/issue_board_entity.rb
+++ b/app/serializers/issue_board_entity.rb
@@ -2,6 +2,7 @@
class IssueBoardEntity < Grape::Entity
include RequestAwareEntity
+ include TimeTrackableEntity
expose :id
expose :iid
diff --git a/spec/fixtures/api/schemas/entities/issue_board.json b/spec/fixtures/api/schemas/entities/issue_board.json
index f7b270ffa8d..7cb65e1f2f5 100644
--- a/spec/fixtures/api/schemas/entities/issue_board.json
+++ b/spec/fixtures/api/schemas/entities/issue_board.json
@@ -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",