diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-17 20:53:09 -0600 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-17 20:53:09 -0600 |
| commit | feeffc442618d92040cd1cc38158b689a09988fd (patch) | |
| tree | b19c0ac2ddae23d830bbc69b99d920eec1f81363 /db/fixtures/production | |
| parent | 1a9c2ddc55cf563ea42d67811a19b2693d7a44e9 (diff) | |
| parent | 5bbc70da9cb439342bdbe022988e4e734d891f44 (diff) | |
| download | gitlab-ce-feeffc442618d92040cd1cc38158b689a09988fd.tar.gz | |
Merge branch 'master' into markdown-tags
Use the latest HTML pipeline gem
Diffstat (limited to 'db/fixtures/production')
| -rw-r--r-- | db/fixtures/production/001_admin.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb index e0b13db020d..8b560ee09e0 100644 --- a/db/fixtures/production/001_admin.rb +++ b/db/fixtures/production/001_admin.rb @@ -1,16 +1,17 @@ -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", name: "Administrator", username: 'root', password: password, - password_confirmation: password, - password_expires_at: Time.now, + password_expires_at: expire_time, theme_id: Gitlab::Theme::MARS ) |