diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 18:09:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 18:09:56 +0300 |
| commit | c08d9c22569d1c9e7c7737e183969593394133d9 (patch) | |
| tree | 8ce1722f852f8921656080e04f6c9e16fa71ddb5 /app/views/shared | |
| parent | 546ddc3f6ac96fdf09934390a938bb391d07dc94 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
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 |