diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
commit | b570d73ecd31e2ca9cf8c2f1adb056edf2869477 (patch) | |
tree | 0b8aa67eab6da552d8499f1fdcf9a7495dcf1379 /spec/support/webmock.rb | |
parent | 34b3567c97ecc0f317adae04e10e4d7d8c8830db (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/webmock.rb')
-rw-r--r-- | spec/support/webmock.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/support/webmock.rb b/spec/support/webmock.rb index 32b88edc2df..57acc3b63b1 100644 --- a/spec/support/webmock.rb +++ b/spec/support/webmock.rb @@ -8,7 +8,11 @@ def webmock_allowed_hosts if ENV.key?('ELASTIC_URL') hosts << URI.parse(ENV['ELASTIC_URL']).host end - end.uniq + + if Gitlab.config.webpack&.dev_server&.enabled + hosts << Gitlab.config.webpack.dev_server.host + end + end.compact.uniq end WebMock.disable_net_connect!(allow_localhost: true, allow: webmock_allowed_hosts) |