summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz.bizon@ntsn.pl>2015-12-02 18:39:12 +0100
committerGrzegorz Bizon <grzegorz.bizon@ntsn.pl>2015-12-03 13:39:00 +0100
commit6fc1b948560b9e19ac5c1412dd2deb98987aefe8 (patch)
tree220350b767ec21745a0b3dfccca694188e6f5e12
parent4676ba1f7c7b37498d26815c1fbe0e02c2ffaeb8 (diff)
downloadgitlab-ce-6fc1b948560b9e19ac5c1412dd2deb98987aefe8.tar.gz
Show flash message instead of alert when note is invalid
-rw-r--r--app/assets/javascripts/notes.js.coffee3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index af0d62c8495..ea190fa8b76 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -112,7 +112,8 @@ class @Notes
###
renderNote: (note) ->
unless note.valid
- alert('You have already used this award emoji !') if note.award
+ if note.award
+ new Flash('You have already used this award emoji !', 'alert')
return
# render note if it not present in loaded list