Merge pull request #8246 from dluchinienoc/master

Do not require immediate password reset if specifying a password

Merge pull request #8246 from dluchinienoc/master
2bb8e93d · Marin Jankovski · 9a2afa00 · 019c0f9e · 2bb8e93d
Commit 2bb8e93d authored Nov 07, 2014 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

001_admin.rb db/fixtures/production/001_admin.rb +8 -6

No files found.
--- a/db/fixtures/production/001_admin.rb
+++ b/db/fixtures/production/001_admin.rb
-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

 )