diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-01-18 15:49:22 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-01-18 15:49:22 +0000 |
| commit | f208897ccbdb539eb16a72d32cce68881eaffca7 (patch) | |
| tree | 1b731e73ac9bc08757c29f1fc157617221eb612c /app/serializers | |
| parent | 5e9196b3bcc31ce7fd698ed49af5d39eae1da630 (diff) | |
| parent | 63b36241945a7f9bb280f360b3b269de8c5be8f6 (diff) | |
| download | gitlab-ce-f208897ccbdb539eb16a72d32cce68881eaffca7.tar.gz | |
Merge branch 'backport-time-tracking-ce' into 'master'
Backport timetracking to CE
See merge request !8195
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/issuable_entity.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/serializers/issuable_entity.rb b/app/serializers/issuable_entity.rb index 17c9160cb19..29aecb50849 100644 --- a/app/serializers/issuable_entity.rb +++ b/app/serializers/issuable_entity.rb @@ -13,4 +13,8 @@ class IssuableEntity < Grape::Entity expose :created_at expose :updated_at expose :deleted_at + expose :time_estimate + expose :total_time_spent + expose :human_time_estimate + expose :human_total_time_spent end |