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

2024-08-21 12:39:30 +09:00 · 2024-08-21 12:39:30 +09:00 · af0f8f01e1
commit af0f8f01e1
parent 97c637e7e2 9ba7c90151
136 changed files with 693 additions and 756 deletions
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@ -170,6 +170,7 @@ namespace :api, format: false do
        collection do
          post :accept, to: 'requests#accept_bulk'
          post :dismiss, to: 'requests#dismiss_bulk'
+          get :merged, to: 'requests#merged?'
        end

        member do