summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-06-11 16:08:34 +0100
committerFilipa Lacerda <filipa@gitlab.com>2018-06-11 16:08:34 +0100
commita9a1512448ed91e92450495c86c2d7c19b67b70d (patch)
treeb063912e11f32be1707becb4fbd794f42612c419 /app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
parent647a4d6a3bac6eb8380dc0fcba03f0524f6de27d (diff)
parent3bd5e10e58aa90577afbd4da0e6a288671efc79e (diff)
downloadgitlab-ce-a9a1512448ed91e92450495c86c2d7c19b67b70d.tar.gz
Merge branch 'master' into fl-eslint-vue-house-keeping
* master: (48 commits) Avoid checking the user format in every url validation Migrate CycleAnalytics::CommitCount to Gitaly Hide project name if searching against a project Unify app/views/search/results by using EE Resolve "Table on Failed Jobs tab is overflowing in IE11 and sm screens" Update MrWidgetAuthorTime and MRWidgetMerged spec fixed specs Fix IDE pipelines eTagPoll not stopping Don't use Gitlab::Utils.nlbr in Gitlab::Git Move gitaly_blame, gitaly_count_commits, gitaly_commit_count to opt-out Rename MrWidgetAuthorTime vue component Use Tooltip component in MrWidgetAuthorTime vue component set max_old_space_size to 3.5 GB for compile-assets job Remove SCLAU to mirror https://gitlab.com/gitlab-org/gitlab-ee/commit/cd5cef8f84a2b8c58a741e90afec232243a9f3a9 Add missing `:comment` attribute Prevent ENV from leaking variables in CI output Bump grape-path-helpers to 1.0.5 Add more logging before a project is destroyed Bump Google Chrome to V67 Upgrade gitlab-markup to fix render issue with reStructuredText ...
Diffstat (limited to 'app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue')
-rw-r--r--app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
index 3acffa425ac..d335c3f55af 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
@@ -1,8 +1,12 @@
<script>
import { parseSeconds, stringifyTime } from '../../../lib/utils/pretty_time';
+import tooltip from '../../../vue_shared/directives/tooltip';
export default {
name: 'TimeTrackingComparisonPane',
+ directives: {
+ tooltip,
+ },
props: {
timeSpent: {
type: Number,
@@ -50,9 +54,8 @@ export default {
<template>
<div class="time-tracking-comparison-pane">
<div
- :aria-valuenow="timeRemainingTooltip"
+ v-tooltip
:title="timeRemainingTooltip"
- :data-original-title="timeRemainingTooltip"
:class="timeRemainingStatusClass"
class="compare-meter"
data-toggle="tooltip"
@@ -62,7 +65,6 @@ export default {
<div
:aria-valuenow="timeRemainingPercent"
class="meter-container"
- role="timeSpentPercent"
>
<div
:style="{ width: timeRemainingPercent }"