summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Tsiolis <tsiolis.g@gmail.com>2018-11-19 13:46:32 +0200
committerGeorge Tsiolis <tsiolis.g@gmail.com>2018-11-21 23:41:38 +0200
commit8826962d2168e614c605f9fe5317731643bb384a (patch)
treee8c61f680d94dab20c662b420b269f40eb5b36e1
parentf252156784baf917d30fd66935778553baabb33d (diff)
downloadgitlab-ce-8826962d2168e614c605f9fe5317731643bb384a.tar.gz
Update `gitlab` npm namespace
-rw-r--r--app/assets/javascripts/cycle_analytics/components/limit_warning_component.vue4
-rw-r--r--app/assets/javascripts/diffs/components/diff_file_header.vue4
-rw-r--r--app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue5
3 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/limit_warning_component.vue b/app/assets/javascripts/cycle_analytics/components/limit_warning_component.vue
index a67a225e20a..ff0f352b333 100644
--- a/app/assets/javascripts/cycle_analytics/components/limit_warning_component.vue
+++ b/app/assets/javascripts/cycle_analytics/components/limit_warning_component.vue
@@ -1,5 +1,5 @@
<script>
-import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective } from '@gitlab/ui';
export default {
directives: {
@@ -16,7 +16,7 @@ export default {
<template>
<span v-if="count === 50" class="events-info float-right">
<i
- v-gl-tooltip.top
+ v-gl-tooltip
:title="
n__('Limited to showing %d event at most', 'Limited to showing %d events at most', 50)
"
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 16bf7bcc07c..60b33e771b4 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -4,7 +4,7 @@ import { mapActions, mapGetters } from 'vuex';
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
import Icon from '~/vue_shared/components/icon.vue';
import FileIcon from '~/vue_shared/components/file_icon.vue';
-import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective } from '@gitlab/ui';
import { truncateSha } from '~/lib/utils/text_utility';
import { __, s__, sprintf } from '~/locale';
import EditButton from './edit_button.vue';
@@ -231,7 +231,7 @@ export default {
<a
v-if="diffFile.external_url"
- v-gl-tooltip
+ v-gl-tooltip.hover
:href="diffFile.external_url"
:title="`View on ${diffFile.formatted_external_url}`"
target="_blank"
diff --git a/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue b/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue
index d9c7444f705..8bcad7ac765 100644
--- a/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue
+++ b/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue
@@ -1,5 +1,5 @@
<script>
-import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective } from '@gitlab/ui';
import timeagoMixin from '../mixins/timeago';
import '../../lib/utils/datetime_utility';
@@ -35,6 +35,7 @@ export default {
v-gl-tooltip="{ placement: tooltipPlacement }"
:class="cssClass"
:title="tooltipTitle(time)"
- v-text="timeFormated(time)">
+ v-text="timeFormated(time)"
+ >
</time>
</template>