Commit a065e272 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '324241-update-date-format-for-billable-members-list' into 'master'

Use full date in billable members last activity

See merge request gitlab-org/gitlab!57828
parents ddfb1fe0 3695e8f1
......@@ -20,7 +20,6 @@ import {
REMOVE_BILLABLE_MEMBER_MODAL_ID,
} from 'ee/billings/seat_usage/constants';
import { s__ } from '~/locale';
import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
import RemoveBillableMemberModal from './remove_billable_member_modal.vue';
export default {
......@@ -38,7 +37,6 @@ export default {
GlSearchBoxByType,
GlTable,
RemoveBillableMemberModal,
TimeAgoTooltip,
},
data() {
return {
......@@ -186,13 +184,8 @@ export default {
</template>
<template #cell(lastActivityTime)="data">
<time-ago-tooltip
v-if="data.item.user.last_activity_on"
:time="data.item.user.last_activity_on"
tooltip-placement="bottom"
/>
<span v-else>
{{ __('Never') }}
<span>
{{ data.item.user.last_activity_on ? data.item.user.last_activity_on : __('Never') }}
</span>
</template>
......
---
title: Use full date in billable members list
merge_request: 57828
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment