diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-07 14:55:26 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-07 14:55:26 +0000 |
| commit | 2d246df57dd8e7da8c2743fba38d31992bc7a3fc (patch) | |
| tree | 8607286a9b9e6d8d0492a9d13f2393f08beb15e2 /app | |
| parent | 8fab8a95b6ae107ff455df82fd7e7f52f588da3a (diff) | |
| parent | 4bf6ffa51a8e1ed67af2c31bde6b472c67b4a963 (diff) | |
| download | gitlab-ce-2d246df57dd8e7da8c2743fba38d31992bc7a3fc.tar.gz | |
Merge branch '30496-remove-undefined-from-emoji-menu-list' into 'master'
Remove `undefined` class from `.emoji-menu-list`
Closes #30496
See merge request !10522
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/awards_handler.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js index 67106e85a37..ce426741637 100644 --- a/app/assets/javascripts/awards_handler.js +++ b/app/assets/javascripts/awards_handler.js @@ -51,7 +51,7 @@ function renderCategory(name, emojiList, opts = {}) { <h5 class="emoji-menu-title"> ${name} </h5> - <ul class="clearfix emoji-menu-list ${opts.menuListClass}"> + <ul class="clearfix emoji-menu-list ${opts.menuListClass || ''}"> ${emojiList.map(emojiName => ` <li class="emoji-menu-list-item"> <button class="emoji-menu-btn text-center js-emoji-btn" type="button"> |