From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Thu, 5 Sep 2019 08:30:41 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=79cf629e1a3610a93f5b9349c18a4464eb859d3d;p=akkoma

Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
---

79cf629e1a3610a93f5b9349c18a4464eb859d3d
diff --cc test/web/twitter_api/util_controller_test.exs
index 349122c05,cf8e69d2b..5a3ae53aa
--- a/test/web/twitter_api/util_controller_test.exs
+++ b/test/web/twitter_api/util_controller_test.exs
@@@ -4,11 -4,8 +4,10 @@@
  
  defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
    use Pleroma.Web.ConnCase
 +  use Oban.Testing, repo: Pleroma.Repo
  
-   alias Pleroma.Notification
    alias Pleroma.Repo
 +  alias Pleroma.Tests.ObanHelpers
    alias Pleroma.User
    alias Pleroma.Web.CommonAPI
    import Pleroma.Factory