Add latest changes from gitlab-org/gitlab@master

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 = {