about summary refs log tree commit diff
path: root/db
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-06-08 15:22:01 +0200
committerMatt Jankowski <mjankowski@thoughtbot.com>2017-06-08 09:22:01 -0400
commitc207b4bb330463c39c202d1c66e2447b55332093 (patch)
tree932150591bd43dc2c4b3490f9be29132911b1bf6 /db
parentb87eb8ea146a54fcfd2533f47622070d0f30a9fa (diff)
Fix db:seed - only run some validations when the field was changed (#3592)
* Fix db:seed - only run some validations when the field was changed

* Add tests
Diffstat (limited to 'db')
-rw-r--r--db/seeds.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/db/seeds.rb b/db/seeds.rb
index cdce04994..6adfeed8d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -2,6 +2,7 @@ Doorkeeper::Application.create!(name: 'Web', superapp: true, redirect_uri: Doork
 
 if Rails.env.development?
   domain = ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain
-  admin  = Account.where(username: 'admin').first_or_create!(username: 'admin')
+  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).save!
 end