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

2024-06-18 07:43:33 +09:00 · 2024-06-18 07:43:33 +09:00 · aa2cdc898a
commit aa2cdc898a
parent 3d0f5697a1 d5f02adad7
271 changed files with 1839 additions and 1397 deletions
--- a/app/views/filters/statuses/index.html.haml
+++ b/app/views/filters/statuses/index.html.haml
@ -13,7 +13,7 @@

 %hr.spacer/

-= form_for(@status_filter_batch_action, url: batch_filter_statuses_path(@filter.id)) do |f|
+= form_with model: @status_filter_batch_action, url: batch_filter_statuses_path(@filter.id) do |f|
  = hidden_field_tag :page, params[:page] || 1

  - Admin::StatusFilter::KEYS.each do |key|