diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 18:58:24 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 18:58:24 +0300 |
| commit | 3f2db9d971dd92b446e2a615ed758090079a8c64 (patch) | |
| tree | c3034fc5bde8c3d0d2516de01e67d44c0c796fa1 /app/assets/javascripts/notes.js.coffee | |
| parent | 5b43eeee97f8e06a4ada4b173cb972c20d58d8ed (diff) | |
| parent | ac4e3e8cf016f2c2b3dcf3997673310a5df658a9 (diff) | |
| download | gitlab-ce-button-focus-state.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into button-focus-statebutton-focus-state
Diffstat (limited to 'app/assets/javascripts/notes.js.coffee')
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index f8151963fa7..7c3d57fc194 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -167,7 +167,7 @@ class @Notes return if note.award - awardsHandler.addAwardToEmojiBar(note.note) + awardsHandler.addAwardToEmojiBar(note.name) awardsHandler.scrollToAwards() # render note if it not present in loaded list |