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
80db0149
Commit
80db0149
authored
7 years ago
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Take timezone into account when comparing dates in the UI
parent
d15b172a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
config/locales/en.yml
config/locales/en.yml
+1
-1
spec/features/dashboard/datetime_on_tooltips_spec.rb
spec/features/dashboard/datetime_on_tooltips_spec.rb
+1
-1
No files found.
config/locales/en.yml
View file @
80db0149
...
...
@@ -248,5 +248,5 @@ en:
default
:
"
%a,
%d
%b
%Y
%H:%M:%S
%z"
long
:
"
%B
%d,
%Y
%H:%M"
short
:
"
%d
%b
%H:%M"
timeago_tooltip
:
"
%b
%-d,
%Y
%-
k
:%M%P"
timeago_tooltip
:
"
%b
%-d,
%Y
%-
l
:%M%P"
pm
:
pm
This diff is collapsed.
Click to expand it.
spec/features/dashboard/datetime_on_tooltips_spec.rb
View file @
80db0149
...
...
@@ -4,7 +4,7 @@ feature 'Tooltips on .timeago dates', feature: true, js: true do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
name:
'test'
,
namespace:
user
.
namespace
)
}
let
(
:created_date
)
{
Date
.
yesterday
.
to_time
}
let
(
:expected_format
)
{
created_date
.
strftime
(
'%b %-d, %Y %l:%M%P'
)
}
let
(
:expected_format
)
{
created_date
.
in_time_zone
.
strftime
(
'%b %-d, %Y %l:%M%P'
)
}
context
'on the activity tab'
do
before
do
...
...
This diff is collapsed.
Click to expand it.
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