kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

DRY with Gitlab.config.webpack.dev_server references

Browse source
This commit is contained in:
Mike Greiling 2017-02-02 14:07:33 -06:00
parent 7ca57c59c8
commit dbcf24c268
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
config/initializers/static_files.rb
View file

@ -15,17 +15,19 @@ if app.config.serve_static_files
# If webpack-dev-server is configured, proxy webpack's public directory # If webpack-dev-server is configured, proxy webpack's public directory
# instead of looking for static assets # instead of looking for static assets
if Gitlab.config.webpack.dev_server.enabled dev_server = Gitlab.config.webpack.dev_server
dev_server = {
if dev_server.enabled
settings = {
enabled: true, enabled: true,
host: Gitlab.config.webpack.dev_server.host, host: dev_server.host,
port: Gitlab.config.webpack.dev_server.port, port: dev_server.port,
manifest_host: Gitlab.config.webpack.dev_server.host, manifest_host: dev_server.host,
manifest_port: Gitlab.config.webpack.dev_server.port, manifest_port: dev_server.port,
} }
if Rails.env.development? if Rails.env.development?
dev_server.merge!( settings.merge!(
host: Gitlab.config.gitlab.host, host: Gitlab.config.gitlab.host,
port: Gitlab.config.gitlab.port, port: Gitlab.config.gitlab.port,
https: Gitlab.config.gitlab.https, https: Gitlab.config.gitlab.https,
@ -34,11 +36,11 @@ if app.config.serve_static_files
Gitlab::Middleware::Static, Gitlab::Middleware::Static,
Gitlab::Middleware::WebpackProxy, Gitlab::Middleware::WebpackProxy,
proxy_path: app.config.webpack.public_path, proxy_path: app.config.webpack.public_path,
proxy_host: Gitlab.config.webpack.dev_server.host, proxy_host: dev_server.host,
proxy_port: Gitlab.config.webpack.dev_server.port, proxy_port: dev_server.port,
) )
end end
app.config.webpack.dev_server.merge!(dev_server) app.config.webpack.dev_server.merge!(settings)
end end
end end