Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

3 files changed, 0 insertions, 55 deletions

diff --git a/test/tasks/ecto/ecto_test.exs b/test/tasks/ecto/ecto_test.exs
deleted file mode 100644
index 3a028df83..000000000
--- a/test/tasks/ecto/ecto_test.exs
+++ /dev/null
@@ -1,15 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Mix.Tasks.Pleroma.EctoTest do
-  use ExUnit.Case, async: true
-
-  test "raise on bad path" do
-    assert_raise RuntimeError, ~r/Could not find migrations directory/, fn ->
-      Mix.Tasks.Pleroma.Ecto.ensure_migrations_path(Pleroma.Repo,
-        migrations_path: "some-path"
-      )
-    end
-  end
-end
diff --git a/test/tasks/ecto/migrate_test.exs b/test/tasks/ecto/migrate_test.exs
deleted file mode 100644
index 43df176a1..000000000
--- a/test/tasks/ecto/migrate_test.exs
+++ /dev/null
@@ -1,20 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-onl
-
-defmodule Mix.Tasks.Pleroma.Ecto.MigrateTest do
-  use Pleroma.DataCase, async: true
-  import ExUnit.CaptureLog
-  require Logger
-
-  test "ecto.migrate info message" do
-    level = Logger.level()
-    Logger.configure(level: :warn)
-
-    assert capture_log(fn ->
-             Mix.Tasks.Pleroma.Ecto.Migrate.run()
-           end) =~ "[info] Already up"
-
-    Logger.configure(level: level)
-  end
-end
diff --git a/test/tasks/ecto/rollback_test.exs b/test/tasks/ecto/rollback_test.exs
deleted file mode 100644
index 0236e35d5..000000000
--- a/test/tasks/ecto/rollback_test.exs
+++ /dev/null
@@ -1,20 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Mix.Tasks.Pleroma.Ecto.RollbackTest do
-  use Pleroma.DataCase
-  import ExUnit.CaptureLog
-  require Logger
-
-  test "ecto.rollback info message" do
-    level = Logger.level()
-    Logger.configure(level: :warn)
-
-    assert capture_log(fn ->
-             Mix.Tasks.Pleroma.Ecto.Rollback.run()
-           end) =~ "[info] Rollback succesfully"
-
-    Logger.configure(level: level)
-  end
-end