mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-15 00:38:27 +00:00
Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Upstream removed their direct dependency `autoprefixer`, which was textually adjacent to glitch-soc-only dependency `atrament`. Removed direct dependency on `autoprefixer`. - `yarn.lock`: Upstream removed their direct dependency `autoprefixer`, which was textually adjacent to glitch-soc-only dependency `atrament`. Removed direct dependency on `autoprefixer`.
This commit is contained in:
@@ -156,6 +156,11 @@ namespace :api, format: false do
|
||||
|
||||
namespace :notifications do
|
||||
resources :requests, only: [:index, :show] do
|
||||
collection do
|
||||
post :accept, to: 'requests#accept_bulk'
|
||||
post :dismiss, to: 'requests#dismiss_bulk'
|
||||
end
|
||||
|
||||
member do
|
||||
post :accept
|
||||
post :dismiss
|
||||
|
||||
Reference in New Issue
Block a user