diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-13 15:10:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-13 15:10:02 +0300 |
commit | 3748ae5cbbefd3de0111951e71e74b676c276d61 (patch) | |
tree | ec12be349757c64eafaafdacd0eb7699adff113b /app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue | |
parent | 19325d74c2a5e7f367c6d1d6a064650f90a5b3e7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue | 2 |
1 files changed, 1 insertions, 1 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 4447a87777a..66088b33c99 100644 --- a/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue +++ b/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue @@ -15,7 +15,7 @@ export default { mixins: [timeagoMixin], props: { time: { - type: String, + type: [String, Number], required: true, }, tooltipPlacement: { |