diff options
author | Robert Speicher <robert@gitlab.com> | 2018-09-17 23:30:24 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-09-17 23:30:24 +0000 |
commit | 4b33b17bf168de6819538fee69020ac9aeba9498 (patch) | |
tree | c3bf64e9314ad198ef6e4e2f522184e7e36581ed /qa | |
parent | c44d8bab91ece5c981c9fb10f5906db86198bb6b (diff) | |
parent | 0337208f719213cfa5c2c92355d118dd67f1b27e (diff) | |
download | gitlab-ce-4b33b17bf168de6819538fee69020ac9aeba9498.tar.gz |
Merge branch 'ml-fix-initial-admin-password' into 'master'
QA: Fix: set initial password even if using admin credentials
See merge request gitlab-org/gitlab-ce!21785
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/page/main/login.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb index 08cf8da34fd..4e9506a7dc8 100644 --- a/qa/qa/page/main/login.rb +++ b/qa/qa/page/main/login.rb @@ -66,6 +66,8 @@ module QA end using_wait_time 0 do + set_initial_password_if_present + sign_in_using_gitlab_credentials(admin) end |