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

2024-09-06 08:42:24 +09:00 · 2024-09-06 08:42:24 +09:00 · f18eabfe75
commit f18eabfe75
parent 71671b09ef 7efe0bde9d
689 changed files with 4369 additions and 2434 deletions
--- a/spec/models/form/custom_emoji_batch_spec.rb
+++ b/spec/models/form/custom_emoji_batch_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-describe Form::CustomEmojiBatch do
+RSpec.describe Form::CustomEmojiBatch do
  describe '#save' do
    subject { described_class.new({ current_account: account }.merge(options)) }