aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-29 11:09:30 +0000
committerlain <lain@soykaf.club>2020-04-29 11:09:30 +0000
commit58fded9858edbeb318dc011cb313e82a86fbafcb (patch)
tree90539822a02e9ff1de91969ad179da907c031b4d /lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex
parent699fc9569fa06278baaec6804348375cb9891185 (diff)
parent4c0e53367acd74de04de070a5e33380f5e457163 (diff)
downloadpleroma-58fded9858edbeb318dc011cb313e82a86fbafcb.tar.gz
Merge branch 'automatic-authentication-and-instance-publicity-checks' into 'develop'
Automatic checks of authentication / authorization / instance publicity See merge request pleroma/pleroma!2409
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex b/lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex
index 84de79413..c4fa383f2 100644
--- a/lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex
@@ -21,8 +21,6 @@ defmodule Pleroma.Web.MastodonAPI.DomainBlockController do
%{scopes: ["follow", "write:blocks"]} when action != :index
)
- plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug)
-
@doc "GET /api/v1/domain_blocks"
def index(%{assigns: %{user: user}} = conn, _) do
json(conn, Map.get(user, :domain_blocks, []))