diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-02-07 21:47:56 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-02-07 21:47:56 +0000 |
| commit | dbb934c8e2b5d138721f9d89afcf8ebbf814bed2 (patch) | |
| tree | e96bd726dcf0ffadbdac55ae2a5d5a611cb8cb99 /app | |
| parent | 4c3dd91f18a0d7fb4aafe807b37520d07563af6a (diff) | |
| parent | 2ee08f4770e59bef976a093428272a16c962fdf4 (diff) | |
| download | gitlab-ce-dbb934c8e2b5d138721f9d89afcf8ebbf814bed2.tar.gz | |
Merge branch '42462-edit-note' into 'master'
Resolve "Cancelling a second comment edit doesn't return its state to before the edit"
Closes #42462
See merge request gitlab-org/gitlab-ce!16869
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_note.vue | 1 |
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(); |