From: kaniini <ariadne@dereferenced.org>
Date: Fri, 27 Sep 2019 07:54:08 +0000 (+0000)
Subject: Merge branch 'split-masto-api/domain-blocks' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=68bf99baf21b4728faab6641ed8dbdafa79d5fb6;p=akkoma

Merge branch 'split-masto-api/domain-blocks' into 'develop'

Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`

See merge request pleroma/pleroma!1729
---

68bf99baf21b4728faab6641ed8dbdafa79d5fb6
diff --cc lib/pleroma/web/router.ex
index b1003fffa,d370f30db..731bec323
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -346,9 -346,9 +346,9 @@@ defmodule Pleroma.Web.Router d
        get("/lists/:id", ListController, :show)
        get("/lists/:id/accounts", ListController, :list_accounts)
  
-       get("/domain_blocks", MastodonAPIController, :domain_blocks)
+       get("/domain_blocks", DomainBlockController, :index)
  
 -      get("/filters", MastodonAPIController, :get_filters)
 +      get("/filters", FilterController, :index)
  
        get("/suggestions", MastodonAPIController, :suggestions)