Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream

2023-07-30 14:33:28 +02:00
parent 5914dfdd69 cfd50f30bb
commit b2515feb29
38 changed files with 121 additions and 94 deletions
--- a/db/seeds/04_admin.rb
+++ b/db/seeds/04_admin.rb
@@ -2,6 +2,7 @@

 if Rails.env.development?
  domain = ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain
+  domain = domain.gsub(/:\d+$/, '')

  admin = Account.where(username: 'admin').first_or_initialize(username: 'admin')
  admin.save(validate: false)