summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorSimon Knox <simon@gitlab.com>2018-02-07 21:45:53 +0000
committerFatih Acet <acetfatih@gmail.com>2018-02-07 21:45:53 +0000
commit2ee08f4770e59bef976a093428272a16c962fdf4 (patch)
tree1ed8855249f94731d5e180bee0584795994477eb /app/assets
parent071b0ef35ce8e97cbdceb379e3e70a1722badca1 (diff)
downloadgitlab-ce-2ee08f4770e59bef976a093428272a16c962fdf4.tar.gz
Resolve "Cancelling a second comment edit doesn't return its state to before the edit"
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/notes/components/noteable_note.vue1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue
index 30e7ccc8229..045077de383 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -102,6 +102,7 @@
.then(() => {
this.isEditing = false;
this.isRequesting = false;
+ this.oldContent = null;
$(this.$refs.noteBody.$el).renderGFM();
this.$refs.noteBody.resetAutoSave();
callback();