Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Removed accidental n+1 query from notifications, updated some deps,

Browse source 
improved how "show more" link looks
This commit is contained in:
Eugen Rochko 2017-01-26 14:52:07 +01:00
parent 2f18c77e44
commit cc5c1e5feb
7 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
db/seeds.rb
View file

@ -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