Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2017-06-30 17:10:09 +0300
committerPhil Hughes <me@iamphill.com>2017-06-30 17:10:09 +0300
commit9e3ef082be2595921319279ec095c2765a66e9e9 (patch)
tree23c83e7ab3919e72121f9d523a958537613dea2a /app/assets/javascripts/notes.js
parent1a449b24a22283aeffa08603d2cff00db10d7fe5 (diff)
Remove placeholder note when award emoji slash command is applied
Diffstat (limited to 'app/assets/javascripts/notes.js')
-rw-r--r--app/assets/javascripts/notes.js4
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();
}