diff options
| author | Phil Hughes <me@iamphill.com> | 2018-05-17 10:15:57 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-05-17 10:15:57 +0300 |
| commit | e5289643afc16293447f60c81bb10c365b731c3e (patch) | |
| tree | c96bf46a2fc96a62ee3bd99ab7a19672840bb6e0 /app/assets/javascripts/vue_shared/components | |
| parent | 60b14e52963238bb2401004350d963eda1fabef6 (diff) | |
| parent | 6a10ed3ff2ddd0e13fe22dbd43c3dcd5e3083910 (diff) | |
Merge branch 'jivl-add-dot-system-notes' into 'master'
Add dot to separate system notes content
Closes #45676
See merge request gitlab-org/gitlab-ce!18864
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue | 4 |
1 files changed, 2 insertions, 2 deletions
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 bec4e7c99b6..368eeb6c453 100644 --- a/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue +++ b/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue @@ -40,7 +40,7 @@ export default { :class="cssClass" :title="tooltipTitle(time)" :data-placement="tooltipPlacement" - data-container="body"> - {{ timeFormated(time) }} + data-container="body" + v-text="timeFormated(time)"> </time> </template> |