From ae2147d40f60fd627dbcfbc6c7f5b2081ed3a518 Mon Sep 17 00:00:00 2001
From: Effy Elden <git@effy.is>
Date: Fri, 27 Jan 2017 02:03:13 +1100
Subject: [PATCH] Add default account details to developer documentation.
---
docs/Running-Mastodon/Development-guide.md | 4 +++-
docs/Running-Mastodon/Vagrant-guide.md | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/docs/Running-Mastodon/Development-guide.md b/docs/Running-Mastodon/Development-guide.md
index 80e6e2f94d..27efa346ed 100644
--- a/docs/Running-Mastodon/Development-guide.md
+++ b/docs/Running-Mastodon/Development-guide.md
@@ -21,7 +21,9 @@ You can run Mastodon with:
rails s
-And open `http://localhost:3000` in your browser. Background jobs run inline (aka synchronously) in the development environment, so you don't need to run a Sidekiq process.
+And open `http://localhost:3000` in your browser. Background jobs run inline (aka synchronously) in the development environment, so you don't need to run a Sidekiq process.
+
+By default, your development environment will have an admin account created for you to use - the email address will be `admin@YOURDOMAIN` (e.g. admin@localhost:3000) and the password will be `mastodonadmin`.
You can run tests with:
diff --git a/docs/Running-Mastodon/Vagrant-guide.md b/docs/Running-Mastodon/Vagrant-guide.md
index a94478392a..b24f14e834 100644
--- a/docs/Running-Mastodon/Vagrant-guide.md
+++ b/docs/Running-Mastodon/Vagrant-guide.md
@@ -28,7 +28,7 @@ Running `vagrant up` for the first time will run provisioning, which will:
The Vagrant box will automatically start after provisioning. It can be started in future with `vagrant up` from the mastodon directory.
-Once the Ubuntu virtual machine has booted, it will run the startup script, which loads the environment variables from `.env.vagrant` and then runs `rails s -d -b 0.0.0.0`. This will start a Rails server. You can then access your development site at http://mastodon.dev (or at http://localhost:3000 if you haven't installed vagrants-hostupdater).
+Once the Ubuntu virtual machine has booted, it will run the startup script, which loads the environment variables from `.env.vagrant` and then runs `rails s -d -b 0.0.0.0`. This will start a Rails server. You can then access your development site at http://mastodon.dev (or at http://localhost:3000 if you haven't installed vagrants-hostupdater). By default, your development environment will have an admin account created for you to use - the email address will be `admin@mastodon.dev` and the password will be `mastodonadmin`.
To stop the server, simply run `vagrant halt`.
--
GitLab