diff options
| author | Phil Hughes <me@iamphill.com> | 2017-11-01 09:26:16 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-11-01 09:26:16 +0000 |
| commit | b20381204ad84069677a53bff1cbe728745c38db (patch) | |
| tree | 0bf5f8ac698b8ee3c5f075920bc6944666ec8da5 /app/assets | |
| parent | 7c331ac9518c68aadc9bba0bbd1d50854699a573 (diff) | |
| download | gitlab-ce-b20381204ad84069677a53bff1cbe728745c38db.tar.gz | |
karma spec updatesvue-update
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/notes/components/issue_note.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/profile/account/components/delete_account_modal.vue | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/issue_note.vue b/app/assets/javascripts/notes/components/issue_note.vue index 0ddbd672bed..40318f9a600 100644 --- a/app/assets/javascripts/notes/components/issue_note.vue +++ b/app/assets/javascripts/notes/components/issue_note.vue @@ -122,7 +122,9 @@ // we need to do this to prevent noteForm inconsistent content warning // this is something we intentionally do so we need to recover the content this.note.note = noteText; - this.$refs.noteBody.$refs.noteForm.note = noteText; // TODO: This could be better + if (this.$refs.noteBody) { + this.$refs.noteBody.$refs.noteForm.note = noteText; // TODO: This could be better + } }, }, created() { diff --git a/app/assets/javascripts/profile/account/components/delete_account_modal.vue b/app/assets/javascripts/profile/account/components/delete_account_modal.vue index b2b34cb83e1..6348a2e331d 100644 --- a/app/assets/javascripts/profile/account/components/delete_account_modal.vue +++ b/app/assets/javascripts/profile/account/components/delete_account_modal.vue @@ -98,7 +98,7 @@ Once you confirm %{deleteAccount}, it cannot be undone or recovered.`), @toggle="toggleOpen" @submit="onSubmit"> - <template slot="body" scope="props"> + <template slot="body" slot-scope="props"> <p v-html="props.text"></p> <form |