diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-26 14:52:07 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-26 14:52:07 +0100 |
| commit | cc5c1e5febf588183145e30dc7e98e5ea33cd398 (patch) | |
| tree | 80c8490331695b37452b6cfe4e75529d160ba6ee /db/seeds.rb | |
| parent | 2f18c77e448e105db691253ad04c83e4b862cbfe (diff) | |
Removed accidental n+1 query from notifications, updated some deps,
improved how "show more" link looks
Diffstat (limited to 'db/seeds.rb')
| -rw-r--r-- | db/seeds.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/db/seeds.rb b/db/seeds.rb index 70edb9ff1..10f2024b3 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,8 @@ web_app = Doorkeeper::Application.new(name: 'Web', superapp: true, redirect_uri: Doorkeeper.configuration.native_redirect_uri, scopes: 'read write follow') web_app.save! + if Rails.env.development? - domain = ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain - account = Account.where(username: 'admin').first_or_initialize(username: 'admin').save! - user = User.where(email: "admin@#{domain}").first_or_initialize(:email => "admin@#{domain}", :password => 'mastodonadmin', :password_confirmation => 'mastodonadmin', :confirmed_at => Time.now, :admin => true, :account => Account.where(username: 'admin').first).save! + domain = ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain + admin = Account.where(username: 'admin').first_or_initialize(username: 'admin').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).save! end |