Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream

2025-12-23 07:20:33 +00:00 · 2024-08-19 18:25:31 +02:00
parent ec1ee7a732 53c183f899
commit 1760f84349
54 changed files with 1054 additions and 447 deletions
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -159,6 +159,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