projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into refactor/discoverable_user_field
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
controller.ex
diff --git
a/lib/pleroma/web/twitter_api/controller.ex
b/lib/pleroma/web/twitter_api/controller.ex
index 429d8013bc42cbca18fceafd5d421c07de8f732b..f42dba4421773eff5fe860c94bd6f82a7a847fd9 100644
(file)
--- a/
lib/pleroma/web/twitter_api/controller.ex
+++ b/
lib/pleroma/web/twitter_api/controller.ex
@@
-6,10
+6,10
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
use Pleroma.Web, :controller
alias Pleroma.Notification
use Pleroma.Web, :controller
alias Pleroma.Notification
- alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
- alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.User
alias Pleroma.Web.OAuth.Token
alias Pleroma.User
alias Pleroma.Web.OAuth.Token
+ alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.TwitterAPI.TokenView
require Logger
alias Pleroma.Web.TwitterAPI.TokenView
require Logger