diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-09-19 21:25:01 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-10-13 16:44:03 +0300 |
| commit | 5f2071c458b19311b035bf18c136e069023b7f5b (patch) | |
| tree | f22c4f86b43a7258321187d300a7506acdcf6ad8 | |
| parent | bb111465a14575fb6d6cc2e11db9b217ada7c431 (diff) | |
changes after rebase
| -rw-r--r-- | lib/pleroma/web/admin_api/controllers/chat_controller.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/admin_api/controllers/instance_document_controller.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/fed_sockets.ex (renamed from lib/pleroma/web/fed_sockets/fed_sockets.ex) | 0 | ||||
| -rw-r--r-- | test/pleroma/web/activity_pub/object_validators/article_note_validator_test.exs (renamed from test/web/activity_pub/object_validators/article_note_validator_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/web/activity_pub/transmogrifier/article_handling_test.exs (renamed from test/web/activity_pub/transmogrifier/article_handling_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/web/activity_pub/transmogrifier/video_handling_test.exs (renamed from test/web/activity_pub/transmogrifier/video_handling_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/web/admin_api/controllers/chat_controller_test.exs (renamed from test/web/admin_api/controllers/chat_controller_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/web/admin_api/controllers/instance_document_controller_test.exs (renamed from test/web/admin_api/controllers/instance_document_controller_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/web/fed_sockets/fed_registry_test.exs (renamed from test/web/fed_sockets/fed_registry_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/web/fed_sockets/fetch_registry_test.exs (renamed from test/web/fed_sockets/fetch_registry_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/web/fed_sockets/socket_info_test.exs (renamed from test/web/fed_sockets/socket_info_test.exs) | 0 |
11 files changed, 3 insertions, 3 deletions
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 index 1fd5899c8..1fd5899c8 100644 --- a/lib/pleroma/web/fed_sockets/fed_sockets.ex +++ b/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 index cc6dab872..cc6dab872 100644 --- 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 diff --git a/test/web/activity_pub/transmogrifier/article_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/article_handling_test.exs index 9b12a470a..9b12a470a 100644 --- a/test/web/activity_pub/transmogrifier/article_handling_test.exs +++ b/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 index 69c953a2e..69c953a2e 100644 --- a/test/web/activity_pub/transmogrifier/video_handling_test.exs +++ b/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 index bd4c9c9d1..bd4c9c9d1 100644 --- a/test/web/admin_api/controllers/chat_controller_test.exs +++ b/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 index 5f7b042f6..5f7b042f6 100644 --- a/test/web/admin_api/controllers/instance_document_controller_test.exs +++ b/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 index 19ac874d6..19ac874d6 100644 --- a/test/web/fed_sockets/fed_registry_test.exs +++ b/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 index 7bd2d995a..7bd2d995a 100644 --- a/test/web/fed_sockets/fetch_registry_test.exs +++ b/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 index db3d6edcd..db3d6edcd 100644 --- a/test/web/fed_sockets/socket_info_test.exs +++ b/test/pleroma/web/fed_sockets/socket_info_test.exs |