diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-04-26 04:48:35 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-04-26 04:48:35 +0000 |
| commit | c4340c652beee10bf840f2a9ad52208715fcd085 (patch) | |
| tree | 950490f881aa93718539fe22b3abf7c0f31a493e /app/assets | |
| parent | d7b0dd8f7d0e51465ead9dbc4348efae8c672952 (diff) | |
| parent | 396dbbd415e12d469f6aecaac4144e74fb8e7ec0 (diff) | |
| download | gitlab-ce-c4340c652beee10bf840f2a9ad52208715fcd085.tar.gz | |
Merge branch 'refactor/58827-migrate-issue-spec-to-jest' into 'master'
Migrated issue spec files to Jest
Closes #58827
See merge request gitlab-org/gitlab-ce!27673
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue | 14 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue b/app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue index 1f9670cf2fc..53e6efa6ea3 100644 --- a/app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue +++ b/app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue @@ -17,15 +17,13 @@ export default { required: true, }, }, - data() { - return { - milestoneDue: this.milestone.due_date ? parsePikadayDate(this.milestone.due_date) : null, - milestoneStart: this.milestone.start_date - ? parsePikadayDate(this.milestone.start_date) - : null, - }; - }, computed: { + milestoneDue() { + return this.milestone.due_date ? parsePikadayDate(this.milestone.due_date) : null; + }, + milestoneStart() { + return this.milestone.start_date ? parsePikadayDate(this.milestone.start_date) : null; + }, isMilestoneStarted() { if (!this.milestoneStart) { return false; diff --git a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue index ffde55bf083..b807a35b421 100644 --- a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue +++ b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue @@ -1,4 +1,5 @@ <script> +import '~/commons/bootstrap'; import { GlTooltipDirective } from '@gitlab/ui'; import { sprintf } from '~/locale'; import IssueMilestone from '../../components/issue/issue_milestone.vue'; |