diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-27 21:25:41 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-27 21:25:41 +0300 |
| commit | 5cd79bd641c4cd473da768b08ef18dc285f10b8e (patch) | |
| tree | 56341eac62d7c06fd9305fb152931eed3fffe051 | |
| parent | d1d69fc64157066f9210801f28c63709db3e60a4 (diff) | |
| parent | 780e3e976dc626a6e1764b2945ab31741ab190a3 (diff) | |
Merge branch 'fix-webpack-dev-server-proxy' into 'master'
Fix broken dev environment in master
See merge request !9557
| -rw-r--r-- | lib/gitlab/middleware/webpack_proxy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/middleware/webpack_proxy.rb b/lib/gitlab/middleware/webpack_proxy.rb index cb60c5f96ba..6105d165810 100644 --- a/lib/gitlab/middleware/webpack_proxy.rb +++ b/lib/gitlab/middleware/webpack_proxy.rb @@ -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) |