Merge branch 'master' into 'master'

Add time tracking to issue board entities Closes #27780 See merge request gitlab-org/gitlab-ce!26850

Merge branch 'master' into 'master'
Add time tracking to issue board entities Closes #27780 See merge request gitlab-org/gitlab-ce!26850
2238b12d · James Lopez · cd566c26 · a2d34fbf · 2238b12d · 2238b12d
--- 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

--- 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",