Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 8 deletions

diff --git a/app/models/concerns/milestoneish.rb b/app/models/concerns/milestoneish.rb
index fac058e5a46..fa5a79cc12b 100644
--- a/app/models/concerns/milestoneish.rb
+++ b/app/models/concerns/milestoneish.rb
@@ -117,20 +117,20 @@ module Milestoneish
     false
   end
 
-  def total_issue_time_spent
-    @total_issue_time_spent ||= issues.joins(:timelogs).sum(:time_spent)
+  def total_time_spent
+    @total_time_spent ||= issues.joins(:timelogs).sum(:time_spent) + merge_requests.joins(:timelogs).sum(:time_spent)
   end
 
-  def human_total_issue_time_spent
-    Gitlab::TimeTrackingFormatter.output(total_issue_time_spent)
+  def human_total_time_spent
+    Gitlab::TimeTrackingFormatter.output(total_time_spent)
   end
 
-  def total_issue_time_estimate
-    @total_issue_time_estimate ||= issues.sum(:time_estimate)
+  def total_time_estimate
+    @total_time_estimate ||= issues.sum(:time_estimate) + merge_requests.sum(:time_estimate)
   end
 
-  def human_total_issue_time_estimate
-    Gitlab::TimeTrackingFormatter.output(total_issue_time_estimate)
+  def human_total_time_estimate
+    Gitlab::TimeTrackingFormatter.output(total_time_estimate)
   end
 
   private