From: Maksim Pechnikov <parallel588@gmail.com>
Date: Tue, 17 Dec 2019 06:24:08 +0000 (+0300)
Subject: Merge branch 'develop' into feature/tag_feed
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a879c396bb3a07929d4821ef2c29610808962c6d;p=akkoma

Merge branch 'develop' into feature/tag_feed
---

a879c396bb3a07929d4821ef2c29610808962c6d
diff --cc lib/pleroma/web/router.ex
index 871f3bf85,f6c128283..b32cd7c90
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -526,11 -527,12 +527,14 @@@ defmodule Pleroma.Web.Router d
      get("/notice/:id", OStatus.OStatusController, :notice)
      get("/notice/:id/embed_player", OStatus.OStatusController, :notice_player)
  
 -    get("/users/:nickname/feed", Feed.FeedController, :feed)
 -    get("/users/:nickname", Feed.FeedController, :feed_redirect)
 +    get("/users/:nickname/feed", Feed.UserController, :feed, as: :user_feed)
 +    get("/users/:nickname", Feed.UserController, :feed_redirect, as: :user_feed)
 +
 +    get("/tags/:tag", Feed.TagController, :feed, as: :tag_feed)
+   end
  
+   scope "/", Pleroma.Web do
+     pipe_through(:browser)
      get("/mailer/unsubscribe/:token", Mailer.SubscriptionController, :unsubscribe)
    end