Merge branch 'refactor/notification-controller' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Thu, 26 Sep 2019 03:13:22 +0000 (03:13 +0000)
committerkaniini <ariadne@dereferenced.org>
Thu, 26 Sep 2019 03:13:22 +0000 (03:13 +0000)
Extract notification actions from `MastodonAPIController` into `NotificationController`

See merge request pleroma/pleroma!1646

1  2 
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
lib/pleroma/web/router.ex
test/web/mastodon_api/mastodon_api_controller_test.exs

index 18a83fd347b5ddff0681bdf8e97e7197eaa9a790,1d53f7509fd4d6e972be4e05c8df88bc1a3c19d2..1e88ff7feec2c1dba5a2772911f0d8881e17a2c6
@@@ -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
Simple merge