From c08d9c22569d1c9e7c7737e183969593394133d9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 3 Apr 2020 15:09:56 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/shared/milestones/_sidebar.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index aa9c4be1cc1..ba1629bd99a 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -93,10 +93,10 @@ = milestone.issues_visible_to_user(current_user).closed.count .block - #issuable-time-tracker{ data: { time_estimate: @milestone.total_issue_time_estimate, - time_spent: @milestone.total_issue_time_spent, - human_time_estimate: @milestone.human_total_issue_time_estimate, - human_time_spent: @milestone.human_total_issue_time_spent, + #issuable-time-tracker{ data: { time_estimate: @milestone.total_time_estimate, + time_spent: @milestone.total_time_spent, + human_time_estimate: @milestone.human_total_time_estimate, + human_time_spent: @milestone.human_total_time_spent, limit_to_hours: Gitlab::CurrentSettings.time_tracking_limit_to_hours.to_s } } = render_if_exists 'shared/milestones/weight', milestone: milestone -- cgit v1.2.1