diff options
| author | reverite <samantha@chalker.io> | 2019-03-15 05:54:30 -0700 |
|---|---|---|
| committer | reverite <samantha@chalker.io> | 2019-03-15 05:54:30 -0700 |
| commit | 75eeb003b09c53d3b4e98046d1c20b0ad8a887bb (patch) | |
| tree | d2ae669ee583c613a474f8698b7ea718da803819 /db/seeds.rb | |
| parent | 41d1369391d70a9cd25bdf96cfe567975793ef5a (diff) | |
| parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'db/seeds.rb')
| -rw-r--r-- | db/seeds.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/seeds.rb b/db/seeds.rb index cf62ebf39..9a6e9dd78 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -4,5 +4,5 @@ if Rails.env.development? domain = ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain admin = Account.where(username: 'admin').first_or_initialize(username: 'admin') admin.save(validate: false) - User.where(email: "admin@#{domain}").first_or_initialize(email: "admin@#{domain}", password: 'mastodonadmin', password_confirmation: 'mastodonadmin', confirmed_at: Time.now.utc, admin: true, account: admin, agreement: true).save! + User.where(email: "admin@#{domain}").first_or_initialize(email: "admin@#{domain}", password: 'mastodonadmin', password_confirmation: 'mastodonadmin', confirmed_at: Time.now.utc, admin: true, account: admin, agreement: true, approved: true).save! end |