diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-12 10:49:50 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-12 10:49:50 +0000 |
commit | ba5b53954872c8ef1804a6111d08ebc8d72f57a3 (patch) | |
tree | 429933df1b11456fd87ac7e32c971678ce8852bf /app/assets | |
parent | d8722e8064a9691e7ad076b6265912ff4f4adf0a (diff) | |
parent | 05e61c369e5b90d38f4c0d89116e3d21b0508023 (diff) | |
download | gitlab-ce-ba5b53954872c8ef1804a6111d08ebc8d72f57a3.tar.gz |
Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master'
Stop "ERROR: TypeError{}" from being logged to the console and fail tests
Closes #37619
See merge request gitlab-org/gitlab-ce!15830
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/notes/components/noteable_note.vue | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 63d48f9de69..9186d6ff64a 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -123,9 +123,7 @@ // 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; - if (this.$refs.noteBody) { - this.$refs.noteBody.$refs.noteForm.note = noteText; // TODO: This could be better - } + this.$refs.noteBody.$refs.noteForm.note = noteText; }, }, created() { |