diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-20 06:21:14 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-20 06:21:14 +0000 |
| commit | 91ab8570c7a63754e04b907ec841ff8cd6ef7adb (patch) | |
| tree | 24579420494d1b6b05ba68621a1480620a9377c2 | |
| parent | d8af525926dede5d3d176d4d8638ce6ac83c3ecb (diff) | |
| parent | c86962e098f1fa6b5f5a616d29e3adac118ff436 (diff) | |
| download | gitlab-ce-91ab8570c7a63754e04b907ec841ff8cd6ef7adb.tar.gz | |
Merge branch 'change-admin-email' into 'master'
Change admin email
Related to #1446
See merge request !979
| -rw-r--r-- | db/fixtures/development/01_admin.rb | 2 | ||||
| -rw-r--r-- | db/fixtures/production/001_admin.rb | 4 | ||||
| -rw-r--r-- | doc/api/merge_requests.md | 26 |
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" |