From: kaniini <nenolod@gmail.com>
Date: Mon, 18 Feb 2019 04:02:41 +0000 (+0000)
Subject: Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7456338ed3d0b36327c3f9b153630d36cd044bb9;p=akkoma

Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'

Add OAuth tokens endpoint

See merge request pleroma/pleroma!805
---

7456338ed3d0b36327c3f9b153630d36cd044bb9
diff --cc test/web/twitter_api/twitter_api_controller_test.exs
index d6b1331bd,3922b3c5e..1571ab68e
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@@ -5,14 -5,10 +5,15 @@@
  defmodule Pleroma.Web.TwitterAPI.ControllerTest do
    use Pleroma.Web.ConnCase
    alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
 -  alias Pleroma.Builders.{ActivityBuilder, UserBuilder}
 -  alias Pleroma.{Repo, Activity, User, Object, Notification}
 +  alias Pleroma.Builders.ActivityBuilder
 +  alias Pleroma.Builders.UserBuilder
 +  alias Pleroma.Repo
 +  alias Pleroma.Activity
 +  alias Pleroma.User
 +  alias Pleroma.Object
 +  alias Pleroma.Notification
    alias Pleroma.Web.ActivityPub.ActivityPub
+   alias Pleroma.Web.OAuth.Token
    alias Pleroma.Web.TwitterAPI.UserView
    alias Pleroma.Web.TwitterAPI.NotificationView
    alias Pleroma.Web.CommonAPI