hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

Browse source
This commit is contained in:
Ivan Tashkinov 2019-08-22 21:01:28 +03:00
commit 7101ba1a21
6 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/ostatus/ostatus_controller.ex
View file

@ -22,6 +22,11 @@ defmodule Pleroma.Web.OStatus.OStatusController do
alias Pleroma.Web.Router
alias Pleroma.Web.XML
plug(
Pleroma.Plugs.RateLimiter,
{:ap_routes, params: ["uuid"]} when action in [:object, :activity]
)
plug(Pleroma.Web.FederatingPlug when action in [:salmon_incoming])
plug(