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
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
Changes
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
...
@@ -9,7 +9,7 @@ module Gitlab
@proxy_port
=
opts
.
fetch
(
:proxy_port
,
3808
)
@proxy_port
=
opts
.
fetch
(
:proxy_port
,
3808
)
@proxy_path
=
opts
[
:proxy_path
]
if
opts
[
:proxy_path
]
@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
end
def
perform_request
(
env
)
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