about summary refs log tree commit diff
path: root/db/seeds.rb
diff options
context:
space:
mode:
authorHiroe Jun <Jun.Hiroe@gmail.com>2017-04-25 22:15:37 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-04-25 15:15:37 +0200
commit52c119052af534bd20422b245ca89e1b2f58f32f (patch)
tree6c4bf5ffc72c92b2e8553488055fe6b0ec757aed /db/seeds.rb
parent9317ec8eb185659b687dec2ba84c3f7463d7b61d (diff)
Refactor seed.rb (#2430)
Diffstat (limited to 'db/seeds.rb')
-rw-r--r--db/seeds.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/db/seeds.rb b/db/seeds.rb
index 997de93e8..cdce04994 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,9 +1,7 @@
-web_app = Doorkeeper::Application.new(name: 'Web', superapp: true, redirect_uri: Doorkeeper.configuration.native_redirect_uri, scopes: 'read write follow')
-web_app.save!
+Doorkeeper::Application.create!(name: 'Web', superapp: true, redirect_uri: Doorkeeper.configuration.native_redirect_uri, scopes: 'read write follow')
 
 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!
+  admin  = Account.where(username: 'admin').first_or_create!(username: 'admin')
   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