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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
033b44eb
Commit
033b44eb
authored
May 29, 2018
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix various bugs related to relative_url_root in development
parent
6b7a70d2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/views/peek/_bar.html.haml
app/views/peek/_bar.html.haml
+1
-1
lib/gitlab/gon_helper.rb
lib/gitlab/gon_helper.rb
+1
-1
lib/gitlab/webpack/dev_server_middleware.rb
lib/gitlab/webpack/dev_server_middleware.rb
+5
-0
No files found.
app/views/peek/_bar.html.haml
View file @
033b44eb
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
#js-peek
{
data:
{
env:
Peek
.
env
,
#js-peek
{
data:
{
env:
Peek
.
env
,
request_id:
Peek
.
request_id
,
request_id:
Peek
.
request_id
,
peek_url:
peek_routes
.
results_url
,
peek_url:
"#{peek_routes_path}/results"
,
profile_url:
url_for
(
safe_params
.
merge
(
lineprofiler:
'true'
))
},
profile_url:
url_for
(
safe_params
.
merge
(
lineprofiler:
'true'
))
},
class:
Peek
.
env
}
class:
Peek
.
env
}
lib/gitlab/gon_helper.rb
View file @
033b44eb
...
@@ -11,7 +11,7 @@ module Gitlab
...
@@ -11,7 +11,7 @@ module Gitlab
gon
.
asset_host
=
ActionController
::
Base
.
asset_host
gon
.
asset_host
=
ActionController
::
Base
.
asset_host
gon
.
webpack_public_path
=
webpack_public_path
gon
.
webpack_public_path
=
webpack_public_path
gon
.
relative_url_root
=
Gitlab
.
config
.
gitlab
.
relative_url_root
gon
.
relative_url_root
=
Gitlab
.
config
.
gitlab
.
relative_url_root
gon
.
shortcuts_path
=
help_page_path
(
'shortcuts'
)
gon
.
shortcuts_path
=
Gitlab
::
Routing
.
url_helpers
.
help_page_path
(
'shortcuts'
)
gon
.
user_color_scheme
=
Gitlab
::
ColorSchemes
.
for_user
(
current_user
).
css_class
gon
.
user_color_scheme
=
Gitlab
::
ColorSchemes
.
for_user
(
current_user
).
css_class
gon
.
sentry_dsn
=
Gitlab
::
CurrentSettings
.
clientside_sentry_dsn
if
Gitlab
::
CurrentSettings
.
clientside_sentry_enabled
gon
.
sentry_dsn
=
Gitlab
::
CurrentSettings
.
clientside_sentry_dsn
if
Gitlab
::
CurrentSettings
.
clientside_sentry_enabled
gon
.
gitlab_url
=
Gitlab
.
config
.
gitlab
.
url
gon
.
gitlab_url
=
Gitlab
.
config
.
gitlab
.
url
...
...
lib/gitlab/webpack/dev_server_middleware.rb
View file @
033b44eb
...
@@ -15,6 +15,11 @@ module Gitlab
...
@@ -15,6 +15,11 @@ module Gitlab
def
perform_request
(
env
)
def
perform_request
(
env
)
if
@proxy_path
&&
env
[
'PATH_INFO'
].
start_with?
(
"/
#{
@proxy_path
}
"
)
if
@proxy_path
&&
env
[
'PATH_INFO'
].
start_with?
(
"/
#{
@proxy_path
}
"
)
if
relative_url_root
=
Rails
.
application
.
config
.
relative_url_root
env
[
'SCRIPT_NAME'
]
=
""
env
[
'REQUEST_PATH'
].
sub!
(
/\A
#{
Regexp
.
escape
(
relative_url_root
)
}
/
,
''
)
end
super
(
env
)
super
(
env
)
else
else
@app
.
call
(
env
)
@app
.
call
(
env
)
...
...
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