Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
GitLab FOSS
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
Container Registry
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GitLab.org
GitLab FOSS
Commits
5cd79bd6
Commit
5cd79bd6
authored
Feb 27, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-webpack-dev-server-proxy' into 'master'
Fix broken dev environment in master See merge request !9557
parents
d1d69fc6
780e3e97
Pipeline
#6715603
failed with stages
in 69 minutes and 54 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lib/gitlab/middleware/webpack_proxy.rb
lib/gitlab/middleware/webpack_proxy.rb
+1
-1
No files found.
lib/gitlab/middleware/webpack_proxy.rb
View file @
5cd79bd6
...
...
@@ -9,7 +9,7 @@ module Gitlab
@proxy_port
=
opts
.
fetch
(
:proxy_port
,
3808
)
@proxy_path
=
opts
[
:proxy_path
]
if
opts
[
:proxy_path
]
super
(
app
,
backend:
"http://
#{
proxy_host
}
:
#{
proxy_port
}
"
,
**
opts
)
super
(
app
,
backend:
"http://
#{
@proxy_host
}
:
#{
@
proxy_port
}
"
,
**
opts
)
end
def
perform_request
(
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