Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
529376bb
Commit
529376bb
authored
Apr 24, 2013
by
Christian Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[BUGFIX] User suggest at team_members/new not working with relative_url_root
* Closing #3540 * Closing #3704
parent
75fbdc40
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
app/assets/javascripts/api.js.coffee
app/assets/javascripts/api.js.coffee
+1
-0
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+1
-0
No files found.
app/assets/javascripts/api.js.coffee
View file @
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
)
app/controllers/application_controller.rb
View file @
529376bb
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment