summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/issue_show/components/fields
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-22 14:14:04 +0100
committerPhil Hughes <me@iamphill.com>2017-05-22 14:14:04 +0100
commit21205d1e8537d965844c68af5b93ffa472144e9b (patch)
tree23701877abcb6609f7086ce5b3443e429267ddcd /app/assets/javascripts/issue_show/components/fields
parent745ec1acd1b0a60a35c78142f6cc99cf92a396c1 (diff)
parent3f996024cd2b7c30f8049e4b056a094100ece9f9 (diff)
downloadgitlab-ce-21205d1e8537d965844c68af5b93ffa472144e9b.tar.gz
Merge branch 'issue-edit-inline' into issue-edit-inline-description-template
[ci skip]
Diffstat (limited to 'app/assets/javascripts/issue_show/components/fields')
-rw-r--r--app/assets/javascripts/issue_show/components/fields/description_template.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/issue_show/components/fields/description_template.vue b/app/assets/javascripts/issue_show/components/fields/description_template.vue
index c679616cca6..1c40b286513 100644
--- a/app/assets/javascripts/issue_show/components/fields/description_template.vue
+++ b/app/assets/javascripts/issue_show/components/fields/description_template.vue
@@ -26,7 +26,7 @@
},
mounted() {
// Create the editor for the template
- const editor = document.querySelector('.detail-page-description .note-textarea');
+ const editor = document.querySelector('.detail-page-description .note-textarea') || {};
editor.setValue = (val) => {
this.formState.description = val;
};