Commit 3f5a3f73 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents 0c8b96bd 9f939cdd
...@@ -6,6 +6,7 @@ v 7.13.0 (unreleased) ...@@ -6,6 +6,7 @@ v 7.13.0 (unreleased)
- Fix invalid timestamps in RSS feeds (Rowan Wookey) - Fix invalid timestamps in RSS feeds (Rowan Wookey)
- Fix error when deleting a user who has projects (Stan Hu) - 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) - 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) - 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) - 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) - Fix JavaScript error when clicking on the comment button on a diff line that has a comment already (Stan Hu)
......
...@@ -62,7 +62,7 @@ The recommended way to install GitLab is using the provided [Omnibus packages](h ...@@ -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. 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 ## Third-party applications
......
...@@ -5,7 +5,7 @@ Gitlab::Seeder.quiet do ...@@ -5,7 +5,7 @@ Gitlab::Seeder.quiet do
s.email = 'admin@example.com' s.email = 'admin@example.com'
s.notification_email = 'admin@example.com' s.notification_email = 'admin@example.com'
s.username = 'root' s.username = 'root'
s.password = '5iveL!fe' s.password = 'password'
s.admin = true s.admin = true
s.projects_limit = 100 s.projects_limit = 100
s.confirmed_at = DateTime.now s.confirmed_at = DateTime.now
......
if ENV['GITLAB_ROOT_PASSWORD'].blank? if ENV['GITLAB_ROOT_PASSWORD'].blank?
password = '5iveL!fe' password = 'password'
expire_time = Time.now expire_time = Time.now
else else
password = ENV['GITLAB_ROOT_PASSWORD'] password = ENV['GITLAB_ROOT_PASSWORD']
......
...@@ -404,7 +404,7 @@ NOTE: Supply `SANITIZE=true` environment variable to `gitlab:check` to omit proj ...@@ -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: 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 root
5iveL!fe password
**Important Note:** On login you'll be prompted to change the password. **Important Note:** On login you'll be prompted to change the password.
......
...@@ -13,7 +13,7 @@ It might take a while before the docker container is responding to queries. ...@@ -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 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. Next time, you can just use docker start and stop to run the container.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment