summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-11-22 16:38:18 +0000
committerMichael Kozono <mkozono@gmail.com>2017-11-22 16:38:18 +0000
commit87b43b731d21955af83ab511de080855aa0ac771 (patch)
treec78d3fd92ba140c42304dc1d7f0ea80d9fe8831d
parent8905c4733e29387ecc0c6713b43ea7b7e6f84fad (diff)
parent3e8687963dfe065fecb7dee7b26c64db0a542255 (diff)
downloadgitlab-ce-87b43b731d21955af83ab511de080855aa0ac771.tar.gz
Merge branch 'qa/gb/fix-gitlab-qa-entrypoint-bad-merge' into '10-2-stable'
Fix incorrect merge in GitLab QA entry page See merge request gitlab-org/gitlab-ce!15540
-rw-r--r--qa/qa/page/main/entry.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/qa/page/main/entry.rb b/qa/qa/page/main/entry.rb
index ac939732b1d..be2e7e8e6c8 100644
--- a/qa/qa/page/main/entry.rb
+++ b/qa/qa/page/main/entry.rb
@@ -3,7 +3,7 @@ module QA
module Main
class Entry < Page::Base
def visit_login_page
- visit("#{Runtime::Scenario.gitlab_address}/users/sign_in")
+ visit('/users/sign_in')
wait_for_instance_to_be_ready
end