Commit 2bb8e93d by Marin Jankovski

Merge pull request #8246 from dluchinienoc/master

Do not require immediate password reset if specifying a password
parents 9a2afa00 019c0f9e
password = if ENV['GITLAB_ROOT_PASSWORD'].blank?
"5iveL!fe"
else
ENV['GITLAB_ROOT_PASSWORD']
end
if ENV['GITLAB_ROOT_PASSWORD'].blank?
password = '5iveL!fe'
expire_time = Time.now
else
password = ENV['GITLAB_ROOT_PASSWORD']
expire_time = nil
end
admin = User.create(
email: "admin@example.com",
......@@ -10,7 +12,7 @@ admin = User.create(
username: 'root',
password: password,
password_confirmation: password,
password_expires_at: Time.now,
password_expires_at: expire_time,
theme_id: Gitlab::Theme::MARS
)
......
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