diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-04-11 14:14:49 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-04-11 14:14:49 -0500 |
| commit | ac9dc81683557be822a23bc037596c43a5005f41 (patch) | |
| tree | 8d7b5f3269c08a23730a1176746dfc5e13a40145 | |
| parent | 195334b90a31926f93ff40a5f9a8fa78486a690f (diff) | |
| download | gitlab-ce-27729-improve-webpack-dev-environment.tar.gz | |
simplify global object refs27729-improve-webpack-dev-environment
| -rw-r--r-- | app/helpers/webpack_helper.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb index eda0a9a8f9d..6bacda9fe75 100644 --- a/app/helpers/webpack_helper.rb +++ b/app/helpers/webpack_helper.rb @@ -15,12 +15,10 @@ module WebpackHelper end # include full webpack-dev-server url for rspec tests running locally - if Rails.env.test? && ::Rails.configuration.webpack.dev_server.enabled - port = ::Rails.configuration.webpack.dev_server.port - protocol = ::Rails.configuration.webpack.dev_server.https ? 'https' : 'http' - - host = ::Rails.configuration.webpack.dev_server.host - host = instance_eval(&host) if host.respond_to?(:call) + if Rails.env.test? && Rails.configuration.webpack.dev_server.enabled + host = Rails.configuration.webpack.dev_server.host + port = Rails.configuration.webpack.dev_server.port + protocol = Rails.configuration.webpack.dev_server.https ? 'https' : 'http' paths.map! do |p| "#{protocol}://#{host}:#{port}#{p}" |