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

Merge branch 'fix-user-autocomplete' into 'master'
e70ffdbf · Robert Speicher · 961e38ac · 17ee4e6c · e70ffdbf
Commit e70ffdbf authored Dec 30, 2015 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

users_select.js.coffee app/assets/javascripts/users_select.js.coffee +1 -1

No files found.
--- 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