Commit 4b33b17b authored by Robert Speicher's avatar Robert Speicher

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
parents c44d8bab 0337208f
...@@ -66,6 +66,8 @@ module QA ...@@ -66,6 +66,8 @@ module QA
end end
using_wait_time 0 do using_wait_time 0 do
set_initial_password_if_present
sign_in_using_gitlab_credentials(admin) sign_in_using_gitlab_credentials(admin)
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