diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-06-11 13:40:01 +0300 |
|---|---|---|
| committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-06-25 04:31:23 +0300 |
| commit | 275a17589c2d468d8671a9f754a50b212273d509 (patch) | |
| tree | fb491229331aa09e74fd14385b0682e693774395 /app/views/shared | |
| parent | 4e283ee706b11fd3b918230976addc9a70603ce6 (diff) | |
Rename to time_tracking_limit_to_hours
Changes migration and all other places the attribute is used
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/boards/components/sidebar/_time_tracker.html.haml | 1 | ||||
| -rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/shared/boards/components/sidebar/_time_tracker.html.haml b/app/views/shared/boards/components/sidebar/_time_tracker.html.haml index b76d44c5907..43081499920 100644 --- a/app/views/shared/boards/components/sidebar/_time_tracker.html.haml +++ b/app/views/shared/boards/components/sidebar/_time_tracker.html.haml @@ -3,4 +3,5 @@ ":time-spent" => "issue.timeSpent || 0", ":human-time-estimate" => "issue.humanTimeEstimate", ":human-time-spent" => "issue.humanTimeSpent", + ":limit-to-hours" => "timeTrackingLimitToHours", "root-path" => "#{root_url}" } diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index b24075c7849..ced6af50501 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -93,7 +93,11 @@ = 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_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, + limit_to_hours: Gitlab::CurrentSettings.time_tracking_limit_to_hours.to_s } } // Fallback while content is loading .title.hide-collapsed = _('Time tracking') |