Commit bc403356 authored by Don Luchini's avatar Don Luchini

Do not require immediate password reset if specifying one when seeding database.

parent 9cf50550
password = if ENV['GITLAB_ROOT_PASSWORD'].blank? password = nil
"5iveL!fe" expire_time = nil
else if ENV['GITLAB_ROOT_PASSWORD'].blank?
ENV['GITLAB_ROOT_PASSWORD'] password = '5iveL!fe'
end expire_time = Time.now
else
password = ENV['GITLAB_ROOT_PASSWORD']
expire_time = nil
end
admin = User.create( admin = User.create(
email: "admin@example.com", email: "admin@example.com",
...@@ -10,7 +14,7 @@ admin = User.create( ...@@ -10,7 +14,7 @@ admin = User.create(
username: 'root', username: 'root',
password: password, password: password,
password_confirmation: password, password_confirmation: password,
password_expires_at: Time.now, password_expires_at: expire_time,
theme_id: Gitlab::Theme::MARS 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