diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2017-06-30 14:10:09 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-06-30 14:10:09 +0000 |
commit | 9e3ef082be2595921319279ec095c2765a66e9e9 (patch) | |
tree | 23c83e7ab3919e72121f9d523a958537613dea2a /app/assets | |
parent | 1a449b24a22283aeffa08603d2cff00db10d7fe5 (diff) | |
download | gitlab-ce-9e3ef082be2595921319279ec095c2765a66e9e9.tar.gz |
Remove placeholder note when award emoji slash command is applied
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/notes.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 46d77b31ffd..194d1730f3d 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -337,6 +337,10 @@ export default class Notes { if (!noteEntity.valid) { if (noteEntity.errors.commands_only) { + if (noteEntity.commands_changes && + Object.keys(noteEntity.commands_changes).length > 0) { + $notesList.find('.system-note.being-posted').remove(); + } this.addFlash(noteEntity.errors.commands_only, 'notice', this.parentTimeline); this.refresh(); } |