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

2023-12-04 12:04:52 +09:00 · 2023-12-04 12:04:52 +09:00 · 94c2396a34
commit 94c2396a34
parent 780426db31 456597dae5
179 changed files with 1036 additions and 775 deletions
--- a/app/controllers/statuses_cleanup_controller.rb
+++ b/app/controllers/statuses_cleanup_controller.rb
@ -14,7 +14,7 @@ class StatusesCleanupController < ApplicationController
    if @policy.update(resource_params)
      redirect_to statuses_cleanup_path, notice: I18n.t('generic.changes_saved_msg')
    else
-      render action: :show
+      render :show
    end
  rescue ActionController::ParameterMissing
    # Do nothing