Commit fe838588 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #3704 from former03/feature_bugfix_js_memberadd_realtive_url_root

[BUGFIX] User suggest at team_members/new not working with relative_url_root
parents c8649c5d 529376bb
...@@ -50,4 +50,5 @@ ...@@ -50,4 +50,5 @@
callback(users) callback(users)
buildUrl: (url) -> buildUrl: (url) ->
url = gon.relative_url_root + url if gon.relative_url_root.present?
return url.replace(':version', gon.api_version) return url.replace(':version', gon.api_version)
...@@ -155,5 +155,6 @@ class ApplicationController < ActionController::Base ...@@ -155,5 +155,6 @@ class ApplicationController < ActionController::Base
gon.api_version = Gitlab::API.version gon.api_version = Gitlab::API.version
gon.api_token = current_user.private_token if current_user 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.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
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment