Merge branch 'rs-default-admin-password' into 'master'

Change the default admin password

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2422

See merge request !865

6 files changed, 7 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 3a50dffbeee..4095ac48782 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 7.13.0 (unreleased)
   - Fix invalid timestamps in RSS feeds (Rowan Wookey)
   - Fix error when deleting a user who has projects (Stan Hu)
   - Fix downloading of patches on public merge requests when user logged out (Stan Hu)
+  - The password for the default administrator (root) account has been changed from "5iveL!fe" to "password".
   - Update maintenance documentation to explain no need to recompile asssets for omnibus installations (Stan Hu)
   - Support commenting on diffs in side-by-side mode (Stan Hu)
   - Fix JavaScript error when clicking on the comment button on a diff line that has a comment already (Stan Hu)
diff --git a/README.md b/README.md
index 52a483aa532..37badd448c1 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ The recommended way to install GitLab is using the provided [Omnibus packages](h
 
 There are various other options to install GitLab, please refer to the [installation page on the GitLab website](https://about.gitlab.com/installation/) for more information.
 
-You can access a new installation with the login **`root`** and password **`5iveL!fe`**, after login you are required to set a unique password.
+You can access a new installation with the login **`root`** and password **`password`**, after login you are required to set a unique password.
 
 ## Third-party applications
 
diff --git a/db/fixtures/development/01_admin.rb b/db/fixtures/development/01_admin.rb
index bba2fc4b186..b25d0dfc701 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 = '5iveL!fe'
+    s.password = 'password'
     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 1c8740f6ba9..1af8dfc0ef0 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 = '5iveL!fe'
+  password = 'password'
   expire_time = Time.now
 else
   password = ENV['GITLAB_ROOT_PASSWORD']
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 8b918cba133..cf58abea4eb 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -404,7 +404,7 @@ NOTE: Supply `SANITIZE=true` environment variable to `gitlab:check` to omit proj
 Visit YOUR_SERVER in your web browser for your first GitLab login. The setup has created a default admin account for you. You can use it to log in:
 
     root
-    5iveL!fe
+    password
 
 **Important Note:** On login you'll be prompted to change the password.
 
diff --git a/docker/README.md b/docker/README.md
index fb3bde5016d..9507aa6a63c 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -13,7 +13,7 @@ It might take a while before the docker container is responding to queries.
 
 You can check the status with something like `sudo docker logs -f 7c10172d7705`.
 
-You can login to the web interface with username `root` and password `5iveL!fe`.
+You can login to the web interface with username `root` and password `password`.
 
 Next time, you can just use docker start and stop to run the container.
 
@@ -159,4 +159,4 @@ sudo docker push sytse/gitlab-data
 
 ## Troubleshooting
 
-Please see the [troubleshooting](troubleshooting.md) file in this directory.
\ No newline at end of file
+Please see the [troubleshooting](troubleshooting.md) file in this directory.