diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-30 18:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-30 18:09:46 +0300 |
| commit | dd240e5cc4e0abc4eef8b97962c247dab43e3777 (patch) | |
| tree | bc0752959bc0713afb555e358bb43d65cf04f48e /lib/gitlab/webpack | |
| parent | 6aa5c04c74d2d70ee7d19ef3a155b2def9dd46de (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/webpack')
| -rw-r--r-- | lib/gitlab/webpack/manifest.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/gitlab/webpack/manifest.rb b/lib/gitlab/webpack/manifest.rb index 7a8f5f2a27a..6a8a7e24ebd 100644 --- a/lib/gitlab/webpack/manifest.rb +++ b/lib/gitlab/webpack/manifest.rb @@ -88,10 +88,9 @@ module Gitlab end def load_dev_server_manifest - host = ::Rails.configuration.webpack.dev_server.host - port = ::Rails.configuration.webpack.dev_server.port - scheme = ::Rails.configuration.webpack.dev_server.https ? 'https' : 'http' - uri = Addressable::URI.new(scheme: scheme, host: host, port: port, path: dev_server_path) + host = ::Rails.configuration.webpack.dev_server.manifest_host + port = ::Rails.configuration.webpack.dev_server.manifest_port + uri = Addressable::URI.new(scheme: 'http', host: host, port: port, path: dev_server_path) # localhost could be blocked via Gitlab::HTTP response = HTTParty.get(uri.to_s, verify: false) # rubocop:disable Gitlab/HTTParty |