Merge commit '7e634eecbc5dc2f65b7bdbfc5c2b5c8a0955156d' into glitch-soc/merge-upstream

spec/system/ocr_spec.rb

@@ -28,6 +28,6 @@ RSpec.describe 'OCR', :attachment_processing, :inline_jobs, :js, :streaming do
 
     click_on('Add text from image')
 
-    expect(page).to have_css('#description', text: /Hello Mastodon\s*/, wait: 10)
+    expect(page).to have_css('#description', text: /Hello Mastodon\s*/, wait: 20)
   end
 end