Download as
Browse Code »

Commit fe838588ae33a6a293f76a0402e88f54dac544cd

Authored by Dmitriy Zaporozhets
2 parents c8649c5d 529376bb
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
Showing 2 changed files with 2 additions and 0 deletions   Show diff stats
app/assets/javascripts/api.js.coffee
  Diff comments   View file @fe83858
@@ -50,4 +50,5 @@ @@ -50,4 +50,5 @@
50 callback(users) 50 callback(users)
51 51
52 buildUrl: (url) -> 52 buildUrl: (url) ->
  53 + url = gon.relative_url_root + url if gon.relative_url_root.present?
53 return url.replace(':version', gon.api_version) 54 return url.replace(':version', gon.api_version)
app/controllers/application_controller.rb
  Diff comments   View file @fe83858
@@ -155,5 +155,6 @@ class ApplicationController < ActionController::Base @@ -155,5 +155,6 @@ class ApplicationController < ActionController::Base
155 gon.api_version = Gitlab::API.version 155 gon.api_version = Gitlab::API.version
156 gon.api_token = current_user.private_token if current_user 156 gon.api_token = current_user.private_token if current_user
157 gon.gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url 157 gon.gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
  158 + gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
158 end 159 end
159 end 160 end