Commit a69dd751 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '254935-remove-relative-date-from-license-status' into 'master'

Use full expiry date in license status

See merge request gitlab-org/gitlab!61481
parents 354207d1 20c53d3e
......@@ -7,6 +7,6 @@
%strong.has-tooltip{ title: @license.expires_at.to_formatted_s(:long), data: { placement: 'top' } }
= _('Free trial will expire in %{days}' % { days: pluralize(@license.remaining_days, 'day') })
- else
%strong= time_ago_with_tooltip(@license.expires_at)
%strong= l(@license.expires_at.to_time.in_time_zone, format: :timeago_tooltip)
- else
%strong= _('Never')
---
title: Replace relative license expiry date with full date
merge_request: 61481
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