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/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-describe Api::BaseController do
+RSpec.describe Api::BaseController do
  controller do
    def success
      head 200
--- a/spec/controllers/api/web/push_subscriptions_controller_spec.rb
+++ b/spec/controllers/api/web/push_subscriptions_controller_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-describe Api::Web::PushSubscriptionsController do
+RSpec.describe Api::Web::PushSubscriptionsController do
  render_views

  let(:user) { Fabricate(:user) }