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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
2949479c
Commit
2949479c
authored
Feb 25, 2019
by
Elias Werberich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove timezone conversion of issue due dates for issue board cards
parent
c44c83c4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/assets/javascripts/boards/components/issue_due_date.vue
app/assets/javascripts/boards/components/issue_due_date.vue
+1
-1
changelogs/unreleased/56251-fix-issue-board-weekday-shift.yml
...gelogs/unreleased/56251-fix-issue-board-weekday-shift.yml
+5
-0
spec/javascripts/boards/components/issue_due_date_spec.js
spec/javascripts/boards/components/issue_due_date_spec.js
+2
-2
No files found.
app/assets/javascripts/boards/components/issue_due_date.vue
View file @
2949479c
...
...
@@ -53,7 +53,7 @@ export default {
}
else
if
(
timeDifference
===
-
1
)
{
return
__
(
'
Yesterday
'
);
}
else
if
(
timeDifference
>
0
&&
timeDifference
<
7
)
{
return
dateFormat
(
issueDueDate
,
'
dddd
'
,
true
);
return
dateFormat
(
issueDueDate
,
'
dddd
'
);
}
return
standardDateFormat
;
...
...
changelogs/unreleased/56251-fix-issue-board-weekday-shift.yml
0 → 100644
View file @
2949479c
---
title
:
"
Fix
weekday
shift
in
issue
board
cards
for
UTC+X
timezones
by
removing
local
timezone
to
UTC
conversion"
merge_request
:
25512
author
:
Elias Werberich
type
:
fixed
spec/javascripts/boards/components/issue_due_date_spec.js
View file @
2949479c
...
...
@@ -43,7 +43,7 @@ describe('Issue Due Date component', () => {
date
.
setDate
(
date
.
getDate
()
+
5
);
vm
=
createComponent
(
date
);
expect
(
vm
.
$el
.
querySelector
(
'
time
'
).
textContent
.
trim
()).
toEqual
(
dateFormat
(
date
,
'
dddd
'
,
true
));
expect
(
vm
.
$el
.
querySelector
(
'
time
'
).
textContent
.
trim
()).
toEqual
(
dateFormat
(
date
,
'
dddd
'
));
});
it
(
'
should render month and day for other dates
'
,
()
=>
{
...
...
@@ -53,7 +53,7 @@ describe('Issue Due Date component', () => {
const
isDueInCurrentYear
=
today
.
getFullYear
()
===
date
.
getFullYear
();
const
format
=
isDueInCurrentYear
?
'
mmm d
'
:
'
mmm d, yyyy
'
;
expect
(
vm
.
$el
.
querySelector
(
'
time
'
).
textContent
.
trim
()).
toEqual
(
dateFormat
(
date
,
format
,
true
));
expect
(
vm
.
$el
.
querySelector
(
'
time
'
).
textContent
.
trim
()).
toEqual
(
dateFormat
(
date
,
format
));
});
it
(
'
should contain the correct `.text-danger` css class for overdue issue
'
,
()
=>
{
...
...
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