Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandra Freihofer <sandra.freihofer@gmail.com>2016-04-01 17:20:29 +0300
committerSandra Freihofer <sandra.freihofer@gmail.com>2016-04-01 17:20:29 +0300
commitbb2214bd64b621e3d0813696535ce4c960612ca1 (patch)
tree1e2c51a34b1c1c4119f5cf6b49aaf36ac395a746 /app/assets/javascripts/awards_handler.coffee
parentde1c81645c6aa29acc1aceafa123a861f822ee49 (diff)
Fix award emoji picker for relative_url
MR !2888 caused a regression where the emoji picker does not load when using relative_url, because the path for the controller was hardcoded.
Diffstat (limited to 'app/assets/javascripts/awards_handler.coffee')
-rw-r--r--app/assets/javascripts/awards_handler.coffee4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 47b080406d4..6a670d5e887 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -1,5 +1,5 @@
class @AwardsHandler
- constructor: (@post_emoji_url, @noteable_type, @noteable_id, @aliases) ->
+ constructor: (@get_emojis_url, @post_emoji_url, @noteable_type, @noteable_id, @aliases) ->
$(".js-add-award").on "click", (event) =>
event.stopPropagation()
event.preventDefault()
@@ -34,7 +34,7 @@ class @AwardsHandler
$("#emoji_search").focus()
else
$('.js-add-award').addClass "is-loading"
- $.get "/emojis", (response) =>
+ $.get @get_emojis_url, (response) =>
$('.js-add-award').removeClass "is-loading"
$(".js-award-holder").append response
setTimeout =>