diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-02-08 12:47:14 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-02-08 12:47:14 +0000 |
| commit | 6ea755fa45406cf31ac8243354c1bb833b60b79b (patch) | |
| tree | 58aabe6558881b9ca2e9785a8b9bd735979b4930 /app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.js | |
| parent | 1afbd96d56e93629994fabec4e0383ca8fd1b9d2 (diff) | |
| parent | 7e424eb852716495073881710e8a8851b4a4cd5a (diff) | |
| download | gitlab-ce-6ea755fa45406cf31ac8243354c1bb833b60b79b.tar.gz | |
Merge branch '2018-02-08-ce-cut-off-to-10-5-stable' into '10-5-stable'
Update 10-5-stable to freeze point
See merge request gitlab-org/gitlab-ce!16993
Diffstat (limited to 'app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.js')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.js b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.js index fd0d4570d68..b5ebccd3795 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.js +++ b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.js @@ -68,7 +68,7 @@ export default { <div class="compare-display-container"> <div class="compare-display pull-left"> <span class="compare-label"> - Spent + {{ s__('TimeTracking|Spent') }} </span> <span class="compare-value spent"> {{ timeSpentHumanReadable }} @@ -76,7 +76,7 @@ export default { </div> <div class="compare-display estimated pull-right"> <span class="compare-label"> - Est + {{ s__('TimeTrackingEstimated|Est') }} </span> <span class="compare-value"> {{ timeEstimateHumanReadable }} |