diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-09 16:55:52 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-09 16:55:52 +0300 |
| commit | 80352b783ce359b70879bc7f2d571f219ae45bb1 (patch) | |
| tree | 6131b75da6e993f1c52d0ce566023316f6c4d9b9 /db | |
| parent | 643c61867cc99f626d58798a5365e7573f90b176 (diff) | |
| parent | cdcedd5b26fcabba451747f37fd2942fe6775410 (diff) | |
Merge branch '3kami3/gitlab-ce-root_email' into 'master'
Add an option to supply root email through an environmental variable.
_Originally opened at !2499 by @3kami3._
---
Add an option to supply root email through an environmental variable.
See merge request !2751
Diffstat (limited to 'db')
| -rw-r--r-- | db/fixtures/production/001_admin.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb index b0c0b6450f6..308b0528c9b 100644 --- a/db/fixtures/production/001_admin.rb +++ b/db/fixtures/production/001_admin.rb @@ -6,8 +6,10 @@ else expire_time = nil end +email = ENV['GITLAB_ROOT_EMAIL'].presence || 'admin@example.com' + admin = User.create( - email: "admin@example.com", + email: email, name: "Administrator", username: 'root', password: password, |