From: Hiroe Jun <Jun.Hiroe@gmail.com>
Date: Tue, 25 Apr 2017 13:15:37 +0000 (+0900)
Subject: Refactor seed.rb (#2430)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=52c119052af534bd20422b245ca89e1b2f58f32f;p=mastodon.git

Refactor seed.rb (#2430)
---

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