From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Sat, 19 Sep 2020 18:25:01 +0000 (+0300)
Subject: changes after rebase
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5f2071c458b19311b035bf18c136e069023b7f5b;p=akkoma

changes after rebase
---

diff --git a/lib/pleroma/web/admin_api/controllers/chat_controller.ex b/lib/pleroma/web/admin_api/controllers/chat_controller.ex
index 967600d69..af8ff8292 100644
--- a/lib/pleroma/web/admin_api/controllers/chat_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/chat_controller.ex
@@ -10,10 +10,10 @@ defmodule Pleroma.Web.AdminAPI.ChatController do
   alias Pleroma.Chat.MessageReference
   alias Pleroma.ModerationLog
   alias Pleroma.Pagination
-  alias Pleroma.Plugs.OAuthScopesPlug
   alias Pleroma.Web.AdminAPI
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView
+  alias Pleroma.Web.Plugs.OAuthScopesPlug
 
   require Logger
 
diff --git a/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex b/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
index 504d9b517..37dbfeb72 100644
--- a/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
@@ -5,9 +5,9 @@
 defmodule Pleroma.Web.AdminAPI.InstanceDocumentController do
   use Pleroma.Web, :controller
 
-  alias Pleroma.Plugs.InstanceStatic
-  alias Pleroma.Plugs.OAuthScopesPlug
   alias Pleroma.Web.InstanceDocument
+  alias Pleroma.Web.Plugs.InstanceStatic
+  alias Pleroma.Web.Plugs.OAuthScopesPlug
 
   plug(Pleroma.Web.ApiSpec.CastAndValidate)
 
diff --git a/lib/pleroma/web/fed_sockets/fed_sockets.ex b/lib/pleroma/web/fed_sockets.ex
similarity index 100%
rename from lib/pleroma/web/fed_sockets/fed_sockets.ex
rename to lib/pleroma/web/fed_sockets.ex
diff --git a/test/web/activity_pub/object_validators/article_note_validator_test.exs b/test/pleroma/web/activity_pub/object_validators/article_note_validator_test.exs
similarity index 100%
rename from test/web/activity_pub/object_validators/article_note_validator_test.exs
rename to test/pleroma/web/activity_pub/object_validators/article_note_validator_test.exs
diff --git a/test/web/activity_pub/transmogrifier/article_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/article_handling_test.exs
similarity index 100%
rename from test/web/activity_pub/transmogrifier/article_handling_test.exs
rename to test/pleroma/web/activity_pub/transmogrifier/article_handling_test.exs
diff --git a/test/web/activity_pub/transmogrifier/video_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/video_handling_test.exs
similarity index 100%
rename from test/web/activity_pub/transmogrifier/video_handling_test.exs
rename to test/pleroma/web/activity_pub/transmogrifier/video_handling_test.exs
diff --git a/test/web/admin_api/controllers/chat_controller_test.exs b/test/pleroma/web/admin_api/controllers/chat_controller_test.exs
similarity index 100%
rename from test/web/admin_api/controllers/chat_controller_test.exs
rename to test/pleroma/web/admin_api/controllers/chat_controller_test.exs
diff --git a/test/web/admin_api/controllers/instance_document_controller_test.exs b/test/pleroma/web/admin_api/controllers/instance_document_controller_test.exs
similarity index 100%
rename from test/web/admin_api/controllers/instance_document_controller_test.exs
rename to test/pleroma/web/admin_api/controllers/instance_document_controller_test.exs
diff --git a/test/web/fed_sockets/fed_registry_test.exs b/test/pleroma/web/fed_sockets/fed_registry_test.exs
similarity index 100%
rename from test/web/fed_sockets/fed_registry_test.exs
rename to test/pleroma/web/fed_sockets/fed_registry_test.exs
diff --git a/test/web/fed_sockets/fetch_registry_test.exs b/test/pleroma/web/fed_sockets/fetch_registry_test.exs
similarity index 100%
rename from test/web/fed_sockets/fetch_registry_test.exs
rename to test/pleroma/web/fed_sockets/fetch_registry_test.exs
diff --git a/test/web/fed_sockets/socket_info_test.exs b/test/pleroma/web/fed_sockets/socket_info_test.exs
similarity index 100%
rename from test/web/fed_sockets/socket_info_test.exs
rename to test/pleroma/web/fed_sockets/socket_info_test.exs