diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 03:27:52 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 03:37:40 +0300 |
| commit | 92af60c2449cae5cbe2a8ef8ea65e973017053c2 (patch) | |
| tree | 8c9e0fff46a85f454863bdb52ed2ce2c2f4db7d0 /app | |
| parent | 52525dc4c28750a61697375900830589bb79eaa9 (diff) | |
| download | gitlab-ce-92af60c2449cae5cbe2a8ef8ea65e973017053c2.tar.gz | |
Move award_menu_url variable into gon object.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 2 | ||||
| -rw-r--r-- | app/views/award_emoji/_awards_block.html.haml | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 0e5dcdc4643..58fd8f05902 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -282,7 +282,7 @@ class @AwardsHandler @createEmojiMenu @getAwardMenuUrl(), => @createEmoji_ votesBlock, emoji - getAwardMenuUrl: -> return gl.awardMenuUrl + getAwardMenuUrl: -> return gon.award_menu_url resolveNameToCssClass: (emoji) -> diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml index 84fd146a26b..02efcecc889 100644 --- a/app/views/award_emoji/_awards_block.html.haml +++ b/app/views/award_emoji/_awards_block.html.haml @@ -7,9 +7,6 @@ = awards.count - if current_user - :javascript - gl.awardMenuUrl = "#{emojis_path}" - .award-menu-holder.js-award-holder %button.btn.award-control.js-add-award{ type: "button" } = icon('smile-o', class: "award-control-icon award-control-icon-normal") |