Commit edfa8639 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 4487d433 49e538d0
...@@ -65,7 +65,7 @@ module QA ...@@ -65,7 +65,7 @@ module QA
# - "https://user:pass@somehost.com:443/wd/hub" # - "https://user:pass@somehost.com:443/wd/hub"
# - "http://localhost:4444/wd/hub" # - "http://localhost:4444/wd/hub"
return unless ENV['QA_REMOTE_GRID'] return if (ENV['QA_REMOTE_GRID'] || '').empty?
"#{remote_grid_protocol}://#{remote_grid_credentials}#{ENV['QA_REMOTE_GRID']}/wd/hub" "#{remote_grid_protocol}://#{remote_grid_credentials}#{ENV['QA_REMOTE_GRID']}/wd/hub"
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment