diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-10-22 22:06:05 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-10-22 22:06:05 +0200 |
| commit | 53be95daf41fc4e59deab149485210835e7e54cd (patch) | |
| tree | 3f377dcc6289049581e2473b7e12f260e774784f /app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue | |
| parent | 3fb7a1f97a812b7b2b5e80a8a0575cb7bfd2d3c4 (diff) | |
| parent | d6be7ed79557ce31a5d0062ceea00c877157a6c7 (diff) | |
| download | gitlab-ce-53be95daf41fc4e59deab149485210835e7e54cd.tar.gz | |
Merge branch 'master' into scheduled-manual-jobs-environment-play-buttons
Conflicts:
spec/javascripts/environments/environment_actions_spec.js
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 | 4 |
1 files changed, 1 insertions, 3 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 368eeb6c453..d760263929a 100644 --- a/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue +++ b/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue @@ -11,9 +11,7 @@ export default { directives: { tooltip, }, - mixins: [ - timeagoMixin, - ], + mixins: [timeagoMixin], props: { time: { type: String, |