From 996e5d79dfefac5dd5cacbfdd08c443f007f4492 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 26 Apr 2018 13:47:21 -0500 Subject: [PATCH] move dev server middleware to new namespace --- config/initializers/static_files.rb | 2 +- .../webpack_proxy.rb => webpack/dev_server_middleware.rb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename lib/gitlab/{middleware/webpack_proxy.rb => webpack/dev_server_middleware.rb} (91%) 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 similarity index 91% rename from lib/gitlab/middleware/webpack_proxy.rb rename to 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)