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
873c0b53
Commit
873c0b53
authored
Jan 02, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
b7e84e84
33a9c35b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
app/assets/javascripts/boards/components/issue_due_date.vue
app/assets/javascripts/boards/components/issue_due_date.vue
+7
-2
changelogs/unreleased/55266-fix-incorrect-due-date-parsing.yml
...elogs/unreleased/55266-fix-incorrect-due-date-parsing.yml
+5
-0
No files found.
app/assets/javascripts/boards/components/issue_due_date.vue
View file @
873c0b53
...
...
@@ -3,7 +3,12 @@ import dateFormat from 'dateformat';
import
{
GlTooltip
}
from
'
@gitlab/ui
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
getDayDifference
,
getTimeago
,
dateInWords
}
from
'
~/lib/utils/datetime_utility
'
;
import
{
getDayDifference
,
getTimeago
,
dateInWords
,
parsePikadayDate
,
}
from
'
~/lib/utils/datetime_utility
'
;
export
default
{
components
:
{
...
...
@@ -54,7 +59,7 @@ export default {
return
standardDateFormat
;
},
issueDueDate
()
{
return
new
Date
(
this
.
date
);
return
parsePikaday
Date
(
this
.
date
);
},
timeDifference
()
{
const
today
=
new
Date
();
...
...
changelogs/unreleased/55266-fix-incorrect-due-date-parsing.yml
0 → 100644
View file @
873c0b53
---
title
:
Use 'parsePikadayDate' to parse due date string
merge_request
:
24045
author
:
type
:
fixed
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