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

2024-06-10 08:19:27 +09:00 · 2024-06-10 08:19:27 +09:00 · 90f2ea9015
commit 90f2ea9015
parent aac7bd31f7 827e36ff9e
125 changed files with 2266 additions and 1504 deletions
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe CustomEmoji do
+RSpec.describe CustomEmoji, :paperclip_processing do
  describe '#search' do
    subject { described_class.search(search_term) }