Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
20c53d3e
Commit
20c53d3e
authored
May 18, 2021
by
Ammar Alakkad
Committed by
Natalia Tepluhina
May 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use full expiry date in license status
parent
d45a96c1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
ee/app/views/admin/licenses/_license_status.html.haml
ee/app/views/admin/licenses/_license_status.html.haml
+1
-1
ee/changelogs/unreleased/254935-remove-relative-date-from-license-status.yml
...eased/254935-remove-relative-date-from-license-status.yml
+5
-0
No files found.
ee/app/views/admin/licenses/_license_status.html.haml
View file @
20c53d3e
...
@@ -7,6 +7,6 @@
...
@@ -7,6 +7,6 @@
%strong
.has-tooltip
{
title:
@license
.
expires_at
.
to_formatted_s
(
:long
),
data:
{
placement:
'top'
}
}
%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'
)
})
=
_
(
'Free trial will expire in %{days}'
%
{
days:
pluralize
(
@license
.
remaining_days
,
'day'
)
})
-
else
-
else
%strong
=
time_ago_with_tooltip
(
@license
.
expires_at
)
%strong
=
l
(
@license
.
expires_at
.
to_time
.
in_time_zone
,
format: :timeago_tooltip
)
-
else
-
else
%strong
=
_
(
'Never'
)
%strong
=
_
(
'Never'
)
ee/changelogs/unreleased/254935-remove-relative-date-from-license-status.yml
0 → 100644
View file @
20c53d3e
---
title
:
Replace relative license expiry date with full date
merge_request
:
61481
author
:
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment