Merge branch 'master' into glitch-soc/merge-upstream

2018-10-08 13:51:33 +02:00
parent 96c3d26870 4c4ff05a46
commit d17844e6d1
58 changed files with 875 additions and 106 deletions
--- a/spec/fabricators/conversation_account_fabricator.rb
+++ b/spec/fabricators/conversation_account_fabricator.rb
@@ -0,0 +1,6 @@
+Fabricator(:conversation_account) do
+  account                 nil
+  conversation            nil
+  participant_account_ids ""
+  last_status             nil
+end
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -2,5 +2,5 @@ Fabricator(:user) do
  account
  email        { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
  password     "123456789"
-  confirmed_at { Time.now }
+  confirmed_at { Time.zone.now }
 end