summaryrefslogtreecommitdiff
path: root/db/fixtures
diff options
context:
space:
mode:
authorDon Luchini <dluchini@enernoc.com>2014-11-04 10:02:38 -0500
committerDon Luchini <dluchini@enernoc.com>2014-11-04 10:02:38 -0500
commitbc403356bb16da28a8c9cb486decf308036fd8f5 (patch)
treef505a805efc20db2d82270b45b2eef4b7ddf5d52 /db/fixtures
parent9cf50550d7a7616cd5dba382bdd7c65473a9c95d (diff)
downloadgitlab-ce-bc403356bb16da28a8c9cb486decf308036fd8f5.tar.gz
Do not require immediate password reset if specifying one when seeding database.
Diffstat (limited to 'db/fixtures')
-rw-r--r--db/fixtures/production/001_admin.rb16
1 files changed, 10 insertions, 6 deletions
diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb
index e0b13db020d..6fe6f63469e 100644
--- a/db/fixtures/production/001_admin.rb
+++ b/db/fixtures/production/001_admin.rb
@@ -1,8 +1,12 @@
-password = if ENV['GITLAB_ROOT_PASSWORD'].blank?
- "5iveL!fe"
- else
- ENV['GITLAB_ROOT_PASSWORD']
- end
+password = nil
+expire_time = nil
+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 +14,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
)