Commit 5cd79bd6 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix-webpack-dev-server-proxy' into 'master'

Fix broken dev environment in master

See merge request !9557
parents d1d69fc6 780e3e97
...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment