Merge remote-tracking branch 'parent/main' into upstream-20240524

2024-05-24 08:33:49 +09:00 · 2024-05-24 08:33:49 +09:00 · c546939a40
commit c546939a40
parent 749816a189 b6fd14f0e2
213 changed files with 2260 additions and 986 deletions
--- a/spec/fabricators/canonical_email_block_fabricator.rb
+++ b/spec/fabricators/canonical_email_block_fabricator.rb
@ -1,6 +1,6 @@
 # frozen_string_literal: true

 Fabricator(:canonical_email_block) do
-  email { |attrs| attrs[:reference_account] ? attrs[:reference_account].user_email : sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
+  email { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
  reference_account { Fabricate.build(:account) }
 end