summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-12-30 01:32:35 +0000
committerRobert Speicher <rspeicher@gmail.com>2015-12-30 14:56:38 -0500
commitdb29304068d7ab0aee3c58972c05a20817bbd8da (patch)
tree8b7268cb5e33cf12b6e760c19322296936c7b32b
parente15ed58df995a8a1e8a9e1b6b8b04a5ae372c4f9 (diff)
downloadgitlab-ce-db29304068d7ab0aee3c58972c05a20817bbd8da.tar.gz
Merge branch 'fix-user-autocomplete' into 'master'
Fixes problem with user autocomplete URI ``` Failed to load resource: net::ERR_NAME_NOT_RESOLVED http://autocomplete/users.json?search=&per_page=20&active=true&current_user=false ``` Fixes #4118, #4136 See merge request !2136
-rw-r--r--app/assets/javascripts/users_select.js.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
index 12abf806bfa..9467011799f 100644
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -117,5 +117,5 @@ class @UsersSelect
callback(users)
buildUrl: (url) ->
- url = gon.relative_url_root + url if gon.relative_url_root?
+ url = gon.relative_url_root.replace(/\/$/, '') + url if gon.relative_url_root?
return url