From bc403356bb16da28a8c9cb486decf308036fd8f5 Mon Sep 17 00:00:00 2001 From: Don Luchini Date: Tue, 4 Nov 2014 10:02:38 -0500 Subject: Do not require immediate password reset if specifying one when seeding database. --- db/fixtures/production/001_admin.rb | 16 ++++++++++------ 1 file 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 ) -- cgit v1.2.1 From 019c0f9e0f0f8b74803be57cb9f8ef8ab2e057ef Mon Sep 17 00:00:00 2001 From: Don Luchini Date: Wed, 5 Nov 2014 08:57:05 -0500 Subject: Remove unnecessary lines. --- db/fixtures/production/001_admin.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb index 6fe6f63469e..0755ac714e1 100644 --- a/db/fixtures/production/001_admin.rb +++ b/db/fixtures/production/001_admin.rb @@ -1,5 +1,3 @@ -password = nil -expire_time = nil if ENV['GITLAB_ROOT_PASSWORD'].blank? password = '5iveL!fe' expire_time = Time.now -- cgit v1.2.1