summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-04-26 13:47:21 -0500
committerMike Greiling <mike@pixelcog.com>2018-05-01 15:15:10 -0500
commit996e5d79dfefac5dd5cacbfdd08c443f007f4492 (patch)
tree98da12a35c4c4a21c7c578696a608d962cf69730
parentf65a1da09353b605acbf349a2d3d024b4abef38c (diff)
downloadgitlab-ce-996e5d79dfefac5dd5cacbfdd08c443f007f4492.tar.gz
move dev server middleware to new namespace
-rw-r--r--config/initializers/static_files.rb2
-rw-r--r--lib/gitlab/webpack/dev_server_middleware.rb (renamed from lib/gitlab/middleware/webpack_proxy.rb)4
2 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/static_files.rb b/config/initializers/static_files.rb
index d3a7a2b9f8b..6c28686e69a 100644
--- a/config/initializers/static_files.rb
+++ b/config/initializers/static_files.rb
@@ -34,7 +34,7 @@ if app.config.serve_static_files
)
app.config.middleware.insert_before(
Gitlab::Middleware::Static,
- Gitlab::Middleware::WebpackProxy,
+ Gitlab::Webpack::DevServerMiddleware,
proxy_path: app.config.webpack.public_path,
proxy_host: dev_server.host,
proxy_port: dev_server.port
diff --git a/lib/gitlab/middleware/webpack_proxy.rb b/lib/gitlab/webpack/dev_server_middleware.rb
index 6aecf63231f..b9a75eaac63 100644
--- a/lib/gitlab/middleware/webpack_proxy.rb
+++ b/lib/gitlab/webpack/dev_server_middleware.rb
@@ -3,8 +3,8 @@
# :nocov:
module Gitlab
- module Middleware
- class WebpackProxy < Rack::Proxy
+ module Webpack
+ class DevServerMiddleware < Rack::Proxy
def initialize(app = nil, opts = {})
@proxy_host = opts.fetch(:proxy_host, 'localhost')
@proxy_port = opts.fetch(:proxy_port, 3808)