From: kaniini <ariadne@dereferenced.org>
Date: Thu, 26 Sep 2019 03:13:22 +0000 (+0000)
Subject: Merge branch 'refactor/notification-controller' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6abe12dceda8d0d32878208987a9631d5d546a3d;p=akkoma

Merge branch 'refactor/notification-controller' into 'develop'

Extract notification actions from `MastodonAPIController` into `NotificationController`

See merge request pleroma/pleroma!1646
---

6abe12dceda8d0d32878208987a9631d5d546a3d
diff --cc lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
index 18a83fd34,1d53f7509..1e88ff7fe
--- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
@@@ -13,10 -13,9 +13,9 @@@ defmodule Pleroma.Web.MastodonAPI.Masto
    alias Pleroma.Bookmark
    alias Pleroma.Config
    alias Pleroma.Conversation.Participation
 +  alias Pleroma.Emoji
    alias Pleroma.Filter
 -  alias Pleroma.Formatter
    alias Pleroma.HTTP
-   alias Pleroma.Notification
    alias Pleroma.Object
    alias Pleroma.Pagination
    alias Pleroma.Plugs.RateLimiter