diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /app/assets/javascripts/admin/users/components | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
download | gitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'app/assets/javascripts/admin/users/components')
-rw-r--r-- | app/assets/javascripts/admin/users/components/user_date.vue | 29 | ||||
-rw-r--r-- | app/assets/javascripts/admin/users/components/users_table.vue | 2 |
2 files changed, 1 insertions, 30 deletions
diff --git a/app/assets/javascripts/admin/users/components/user_date.vue b/app/assets/javascripts/admin/users/components/user_date.vue deleted file mode 100644 index 38dddbf72c2..00000000000 --- a/app/assets/javascripts/admin/users/components/user_date.vue +++ /dev/null @@ -1,29 +0,0 @@ -<script> -import { formatDate } from '~/lib/utils/datetime_utility'; -import { __ } from '~/locale'; -import { SHORT_DATE_FORMAT } from '../constants'; - -export default { - props: { - date: { - type: String, - required: false, - default: null, - }, - }, - computed: { - formattedDate() { - const { date } = this; - if (date === null) { - return __('Never'); - } - return formatDate(new Date(date), SHORT_DATE_FORMAT); - }, - }, -}; -</script> -<template> - <span> - {{ formattedDate }} - </span> -</template> diff --git a/app/assets/javascripts/admin/users/components/users_table.vue b/app/assets/javascripts/admin/users/components/users_table.vue index 8962068601c..8b41a063abc 100644 --- a/app/assets/javascripts/admin/users/components/users_table.vue +++ b/app/assets/javascripts/admin/users/components/users_table.vue @@ -1,9 +1,9 @@ <script> import { GlTable } from '@gitlab/ui'; import { __ } from '~/locale'; +import UserDate from '~/vue_shared/components/user_date.vue'; import UserActions from './user_actions.vue'; import UserAvatar from './user_avatar.vue'; -import UserDate from './user_date.vue'; const DEFAULT_TH_CLASSES = 'gl-bg-transparent! gl-border-b-solid! gl-border-b-gray-100! gl-p-5! gl-border-b-1!'; |