summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-19 14:27:01 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-19 14:27:01 +0300
commitc86962e098f1fa6b5f5a616d29e3adac118ff436 (patch)
tree2802fa977e417e09e7d1100611e706ee9e26ea2c
parent84b6163b794c101370c1713a68cb24c6b586c2d5 (diff)
downloadgitlab-ce-c86962e098f1fa6b5f5a616d29e3adac118ff436.tar.gz
Change deafult admin email to example.com
-rw-r--r--db/fixtures/development/01_admin.rb2
-rw-r--r--db/fixtures/production/001_admin.rb4
-rw-r--r--doc/api/merge_requests.md26
3 files changed, 16 insertions, 16 deletions
diff --git a/db/fixtures/development/01_admin.rb b/db/fixtures/development/01_admin.rb
index 42d18435340..176845fd8a8 100644
--- a/db/fixtures/development/01_admin.rb
+++ b/db/fixtures/development/01_admin.rb
@@ -2,7 +2,7 @@ User.seed(:id, [
{
id: 1,
name: "Administrator",
- email: "admin@local.host",
+ email: "admin@example.com",
username: 'root',
password: "5iveL!fe",
password_confirmation: "5iveL!fe",
diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb
index a919fad7040..c00ba3c10ba 100644
--- a/db/fixtures/production/001_admin.rb
+++ b/db/fixtures/production/001_admin.rb
@@ -1,5 +1,5 @@
admin = User.create(
- email: "admin@local.host",
+ email: "admin@example.com",
name: "Administrator",
username: 'root',
password: "5iveL!fe",
@@ -18,7 +18,7 @@ if admin.valid?
puts %q[
Administrator account created:
-login.........admin@local.host
+login.........root
password......5iveL!fe
]
end
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 27c0d644e11..a46472a0812 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -30,7 +30,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
@@ -38,7 +38,7 @@ Parameters:
"assignee": {
"id": 1,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
@@ -74,7 +74,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
@@ -82,7 +82,7 @@ Parameters:
"assignee": {
"id": 1,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
@@ -120,7 +120,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
@@ -128,7 +128,7 @@ Parameters:
"assignee": {
"id": 1,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
@@ -167,7 +167,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
@@ -175,7 +175,7 @@ Parameters:
"assignee": {
"id": 1,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
@@ -218,7 +218,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
@@ -226,7 +226,7 @@ Parameters:
"assignee": {
"id": 1,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
@@ -253,7 +253,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"blocked": false,
"created_at": "2012-04-29T08:46:00Z"
@@ -282,7 +282,7 @@ Parameters:
"author": {
"id": 11,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2014-03-06T08:17:35.000Z"
@@ -293,7 +293,7 @@ Parameters:
"author": {
"id": 11,
"username": "admin",
- "email": "admin@local.host",
+ "email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2014-03-06T08:17:35.000Z"