summaryrefslogtreecommitdiff
path: root/db/fixtures
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2015-07-14 17:59:36 +0200
committerSytse Sijbrandij <sytse@gitlab.com>2015-07-14 17:59:36 +0200
commitb3ab0e4efb6c242cf39805fb8c94c3e6023d15ec (patch)
tree4f7c45846ff3f48010d3037809af207471799c05 /db/fixtures
parent1da6d42bca549265112aee4375b35181d39952f9 (diff)
downloadgitlab-ce-b3ab0e4efb6c242cf39805fb8c94c3e6023d15ec.tar.gz
Revert "Change default admin password from "5iveL!fe" to "password""
This reverts commit 8a01a1222875b190d32769f7a6e7a74720079d2a.
Diffstat (limited to 'db/fixtures')
-rw-r--r--db/fixtures/development/01_admin.rb2
-rw-r--r--db/fixtures/production/001_admin.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/db/fixtures/development/01_admin.rb b/db/fixtures/development/01_admin.rb
index b25d0dfc701..bba2fc4b186 100644
--- a/db/fixtures/development/01_admin.rb
+++ b/db/fixtures/development/01_admin.rb
@@ -5,7 +5,7 @@ Gitlab::Seeder.quiet do
s.email = 'admin@example.com'
s.notification_email = 'admin@example.com'
s.username = 'root'
- s.password = 'password'
+ s.password = '5iveL!fe'
s.admin = true
s.projects_limit = 100
s.confirmed_at = DateTime.now
diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb
index 1af8dfc0ef0..1c8740f6ba9 100644
--- a/db/fixtures/production/001_admin.rb
+++ b/db/fixtures/production/001_admin.rb
@@ -1,5 +1,5 @@
if ENV['GITLAB_ROOT_PASSWORD'].blank?
- password = 'password'
+ password = '5iveL!fe'
expire_time = Time.now
else
password = ENV['GITLAB_ROOT_PASSWORD']