Commit 2a034467 authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch 'qa-shl-use-initial-root-password' into 'master'

Use the GITLAB_INITIAL_ROOT_PASSWORD env var if available

See merge request gitlab-org/gitlab!58090
parents 6d7ab904 18f9f473
...@@ -144,6 +144,10 @@ module QA ...@@ -144,6 +144,10 @@ module QA
ENV['GITLAB_PASSWORD'] ENV['GITLAB_PASSWORD']
end end
def initial_root_password
ENV['GITLAB_INITIAL_ROOT_PASSWORD']
end
def github_username def github_username
ENV['GITHUB_USERNAME'] ENV['GITHUB_USERNAME']
end end
......
...@@ -18,7 +18,7 @@ module QA ...@@ -18,7 +18,7 @@ module QA
end end
def default_password def default_password
'5iveL!fe' Runtime::Env.initial_root_password || '5iveL!fe'
end end
def username def username
......
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