merge master

2019-12-03 17:55:58 +01:00
parent 94026dcedf 1270bc3684
commit 4a77536c5f
26 changed files with 3405 additions and 1620 deletions
--- a/db/seeds.rb
+++ b/db/seeds.rb
@ -18,7 +18,7 @@ end

 # delete all present records
 Rails.application.eager_load!
-(ApplicationRecord.descendants - [ActiveRecord::SchemaMigration]).each(&:delete_all)
+(ApplicationRecord.descendants - [ActiveRecord::SchemaMigration, User]).each(&:delete_all)

 # delete file uploads
 FileUtils.rm_rf(Rails.root.join('public', 'uploads'))