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

2023-11-07 11:35:05 +09:00 · 2023-11-07 11:35:05 +09:00 · 64578feeb4
commit 64578feeb4
parent 9416eeae98 d6f50839e1
69 changed files with 437 additions and 218 deletions
--- a/spec/requests/api/v2/media_spec.rb
+++ b/spec/requests/api/v2/media_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe 'Media API', paperclip_processing: true do
+RSpec.describe 'Media API', :paperclip_processing do
  let(:user)    { Fabricate(:user) }
  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
  let(:scopes)  { 'write' }