diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-01-02 16:10:10 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-01-02 16:10:10 +0000 |
| commit | 33a9c35b58cdded45e83ba3cd4b161b5d51ffcab (patch) | |
| tree | 88a05c57d15d3a66496252ac5d5113be296c26d5 | |
| parent | ca6fbe8a79431aa52f23a500c2be3f8545942ec1 (diff) | |
| parent | 86c096e5ba18f4b902aaf146d06d17a7e21627e5 (diff) | |
| download | gitlab-ce-33a9c35b58cdded45e83ba3cd4b161b5d51ffcab.tar.gz | |
Merge branch '55266-fix-incorrect-due-date-parsing' into 'master'
Use `parsePikadayDate` to parse due date string
Closes #55266
See merge request gitlab-org/gitlab-ce!24045
| -rw-r--r-- | app/assets/javascripts/boards/components/issue_due_date.vue | 9 | ||||
| -rw-r--r-- | changelogs/unreleased/55266-fix-incorrect-due-date-parsing.yml | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/components/issue_due_date.vue b/app/assets/javascripts/boards/components/issue_due_date.vue index e038198e6f0..9c4c6632976 100644 --- a/app/assets/javascripts/boards/components/issue_due_date.vue +++ b/app/assets/javascripts/boards/components/issue_due_date.vue @@ -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 parsePikadayDate(this.date); }, timeDifference() { const today = new Date(); diff --git a/changelogs/unreleased/55266-fix-incorrect-due-date-parsing.yml b/changelogs/unreleased/55266-fix-incorrect-due-date-parsing.yml new file mode 100644 index 00000000000..62a57085192 --- /dev/null +++ b/changelogs/unreleased/55266-fix-incorrect-due-date-parsing.yml @@ -0,0 +1,5 @@ +--- +title: Use 'parsePikadayDate' to parse due date string +merge_request: 24045 +author: +type: fixed |