Automatic merge of gitlab-org/gitlab-ce master

edfa8639 · GitLab Bot · 4487d433 · 49e538d0 · edfa8639
Commit edfa8639 authored Jan 17, 2019 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

qa/qa/runtime/env.rb qa/qa/runtime/env.rb +1 -1

No files found.
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -65,7 +65,7 @@ module QA
        # - "https://user:pass@somehost.com:443/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"
      end