summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorRiccardo Padovani <riccardo@rpadovani.com>2018-02-21 17:20:56 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-02-21 17:20:56 +0000
commit99b96a7b5f5615021bb023e8c8ef4d8827eb9cef (patch)
tree85121005f509f1acd8b9575d5a0304e99853dd92 /app/models
parent576dd646c8436641f03a5b94e1daaecbe90b78c5 (diff)
downloadgitlab-ce-99b96a7b5f5615021bb023e8c8ef4d8827eb9cef.tar.gz
#28481: Display time tracking totals on milestone page
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/milestoneish.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/concerns/milestoneish.rb b/app/models/concerns/milestoneish.rb
index fd6703831e4..caf8afa97f9 100644
--- a/app/models/concerns/milestoneish.rb
+++ b/app/models/concerns/milestoneish.rb
@@ -94,6 +94,14 @@ module Milestoneish
Gitlab::TimeTrackingFormatter.output(total_issue_time_spent)
end
+ def total_issue_time_estimate
+ @total_issue_time_estimate ||= issues.sum(:time_estimate)
+ end
+
+ def human_total_issue_time_estimate
+ Gitlab::TimeTrackingFormatter.output(total_issue_time_estimate)
+ end
+
private
def count_issues_by_state(user)