diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-16 13:41:45 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-16 13:41:45 +0000 |
| commit | 4fcff0bfa2f0d8b0a9f60e93bee807334557918f (patch) | |
| tree | c5b12f640bd73d4c63e3246d24bf16ecf0892766 /app/assets/javascripts/issue_show/components/description.vue | |
| parent | 5f2b142b66ed8f355b36b91907ca9bea17c070f2 (diff) | |
| parent | 9b93a3f2773135d9cbac3c16a5f66c42916e1f65 (diff) | |
| download | gitlab-ce-4fcff0bfa2f0d8b0a9f60e93bee807334557918f.tar.gz | |
Merge branch 'issue-edit-inline-description-field' into 'issue-edit-inline'
Issue edit inline description field
See merge request !11336
Diffstat (limited to 'app/assets/javascripts/issue_show/components/description.vue')
| -rw-r--r-- | app/assets/javascripts/issue_show/components/description.vue | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/issue_show/components/description.vue b/app/assets/javascripts/issue_show/components/description.vue index 4ad3eb7dfd7..3281ec6b172 100644 --- a/app/assets/javascripts/issue_show/components/description.vue +++ b/app/assets/javascripts/issue_show/components/description.vue @@ -18,11 +18,13 @@ }, updatedAt: { type: String, - required: true, + required: false, + default: '', }, taskStatus: { type: String, - required: true, + required: false, + default: '', }, }, data() { @@ -83,6 +85,7 @@ <template> <div + v-if="descriptionHtml" class="description" :class="{ 'js-task-list-container': canUpdate |