diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-19 03:53:25 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-19 03:53:25 +0000 |
| commit | 47c9b972b9ef5133f588fdcdc4eeda00888d269e (patch) | |
| tree | 3df4c6075ccd66f6c5e3778eb3946752d9916b63 /lib | |
| parent | 22c366a85f2a41c1344b863446491c866c47a8a4 (diff) | |
| parent | f4fcea5258a5dbffdf8929887251c64e32c2fd3e (diff) | |
| download | pleroma-47c9b972b9ef5133f588fdcdc4eeda00888d269e.tar.gz | |
Merge branch 'fix/fake-filters' into 'develop'
Revert "Mastodon API: Fake support for loading filters"
See merge request pleroma/pleroma!348
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/router.ex | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index e5d4245c4..031fc1a5d 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -1189,8 +1189,4 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do json(conn, []) end end - - def filters(conn, _) do - json(conn, []) - end end diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 856679899..d324efb7e 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -172,8 +172,6 @@ defmodule Pleroma.Web.Router do delete("/filters/:id", MastodonAPIController, :delete_filter) get("/suggestions", MastodonAPIController, :suggestions) - - get("/filters", MastodonAPIController, :filters) end scope "/api/web", Pleroma.Web.MastodonAPI do |