[BUGFIX] User suggest at team_members/new not working with relative_url_root

* Closing #3540
* Closing #3704

diff --git a/app/assets/javascripts/api.js.coffee b/app/assets/javascripts/api.js.coffee
index ca72151..7cac971 100644 (file)
--- a/app/assets/javascripts/api.js.coffee
+++ b/app/assets/javascripts/api.js.coffee
@@ -50,4 +50,5 @@
       callback(users)
 
   buildUrl: (url) ->
+    url = gon.relative_url_root + url if gon.relative_url_root.present?
     return url.replace(':version', gon.api_version)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 32b1246..22fe5ab 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -155,5 +155,6 @@ class ApplicationController < ActionController::Base
     gon.api_version = Gitlab::API.version
     gon.api_token = current_user.private_token if current_user
     gon.gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
+    gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
   end
 end