From: Ivan Tashkinov <ivant.business@gmail.com>
Date: Tue, 2 Apr 2019 11:05:34 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=37925cbe78b7fc73f28cc85ffcf1e16fb00f7a24;p=akkoma

Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
#	lib/pleroma/web/oauth/oauth_controller.ex
#	lib/pleroma/web/router.ex
---

37925cbe78b7fc73f28cc85ffcf1e16fb00f7a24
diff --cc lib/pleroma/web/router.ex
index b09d1e31c,605a327fc..5101e1b18
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -5,11 -5,11 +5,16 @@@
  defmodule Pleroma.Web.Router do
    use Pleroma.Web, :router
  
 +  pipeline :browser do
 +    plug(:accepts, ["html"])
 +    plug(:fetch_session)
 +  end
 +
+   pipeline :oauth do
+     plug(:fetch_session)
+     plug(Pleroma.Plugs.OAuthPlug)
+   end
+ 
    pipeline :api do
      plug(:accepts, ["json"])
      plug(:fetch_session)