diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-02 12:09:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-02 12:09:02 +0300 |
commit | afcacea9362b7990b80696c2e63c2a9100f92ab5 (patch) | |
tree | 11dc9509dbe8ac2b492ecdc6d02dbc68559797ae /app/assets/javascripts/admin | |
parent | 34dbe8c77e926913caca0050a32cb5261c4ab29c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/admin')
3 files changed, 1 insertions, 32 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!'; diff --git a/app/assets/javascripts/admin/users/constants.js b/app/assets/javascripts/admin/users/constants.js index 8ea1bd3ca7a..c55edefe607 100644 --- a/app/assets/javascripts/admin/users/constants.js +++ b/app/assets/javascripts/admin/users/constants.js @@ -2,8 +2,6 @@ import { s__, __ } from '~/locale'; export const USER_AVATAR_SIZE = 32; -export const SHORT_DATE_FORMAT = 'd mmm, yyyy'; - export const LENGTH_OF_USER_NOTE_TOOLTIP = 100; export const I18N_USER_ACTIONS = { |