hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Ivan Tashkinov 2019-03-15 17:11:00 +03:00
commit 2739057442
143 changed files with 1123 additions and 500 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/oauth/oauth_controller.ex
View file

@ -5,13 +5,13 @@
defmodule Pleroma.Web.OAuth.OAuthController do
use Pleroma.Web, :controller
alias Pleroma.Web.Auth.Authenticator
alias Pleroma.Web.OAuth.Authorization
alias Pleroma.Web.OAuth.Token
alias Pleroma.Web.OAuth.App
alias Comeonin.Pbkdf2
alias Pleroma.Repo
alias Pleroma.User
alias Comeonin.Pbkdf2
alias Pleroma.Web.Auth.Authenticator
alias Pleroma.Web.OAuth.App
alias Pleroma.Web.OAuth.Authorization
alias Pleroma.Web.OAuth.Token
import Pleroma.Web.ControllerHelper, only: [oauth_scopes: 2]