aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-08-31 10:45:37 +0300
committerrinpatch <rinpatch@sdf.org>2019-08-31 10:45:37 +0300
commitdbfcba85ec2d3336219c75a32adbcff93a684309 (patch)
treedad351a56d09ba94b220d635f4d9cf6575f8cf3f
parent64410497d20869f9b6c1c92a48761157048b0cb9 (diff)
downloadpleroma-dbfcba85ec2d3336219c75a32adbcff93a684309.tar.gz
Add a changelog entry for twitterapi removal and fix credo issues
-rw-r--r--CHANGELOG.md1
-rw-r--r--test/web/twitter_api/twitter_api_test.exs2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fdcb014a..e8ea83005 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- RichMedia: add the rich media ttl based on image expiration time.
### Removed
+- GNU Social API with Qvitter extensions support
- Emoji: Remove longfox emojis.
- Remove `Reply-To` header from report emails for admins.
- ActivityPub: The `accept_blocks` configuration setting.
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 50ed43c15..0a57e174f 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -7,8 +7,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.UserInviteToken
- alias Pleroma.Web.TwitterAPI.TwitterAPI
alias Pleroma.Web.MastodonAPI.AccountView
+ alias Pleroma.Web.TwitterAPI.TwitterAPI
import Pleroma.Factory