diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 22:39:32 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 22:39:32 +0000 |
| commit | 433e0a41cba9ad15269208b8bb92462180b17306 (patch) | |
| tree | 7ee0d231eab19259106a54b5dc7df1d1a81b18ed | |
| parent | 102f4d8dd748e9caaa11a40b29396a7c599226aa (diff) | |
| parent | bcc3f8f237f5cf2b64088564637f8bb22d3522c8 (diff) | |
| download | gitlab-ce-433e0a41cba9ad15269208b8bb92462180b17306.tar.gz | |
Merge branch 'award-emoji-fix' into 'master'
Fix emoji block selector.
Fixes #18465 and #18577
See merge request !4604
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 136db8ee14d..030f1564862 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -40,7 +40,7 @@ class @AwardsHandler $menu = $ '.emoji-menu' if $addBtn.hasClass 'js-note-emoji' - $addBtn.parents('.note').find('.js-awards-block').addClass 'current' + $addBtn.closest('.note').find('.js-awards-block').addClass 'current' else $addBtn.closest('.js-awards-block').addClass 'current' |