bss
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes after rebase

This commit is contained in:
Alexander Strizhakov 2020-09-19 21:25:01 +03:00
parent bb111465a1
commit 5f2071c458
No known key found for this signature in database
GPG Key ID: 022896A53AEF1381
11 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/admin_api/controllers/chat_controller.ex
View File

@ -10,10 +10,10 @@ defmodule Pleroma.Web.AdminAPI.ChatController do
alias Pleroma.Chat.MessageReference alias Pleroma.Chat.MessageReference
alias Pleroma.ModerationLog alias Pleroma.ModerationLog
alias Pleroma.Pagination alias Pleroma.Pagination
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Web.AdminAPI alias Pleroma.Web.AdminAPI
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView
alias Pleroma.Web.Plugs.OAuthScopesPlug
require Logger require Logger

4
lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
View File

@ -5,9 +5,9 @@
defmodule Pleroma.Web.AdminAPI.InstanceDocumentController do defmodule Pleroma.Web.AdminAPI.InstanceDocumentController do
use Pleroma.Web, :controller use Pleroma.Web, :controller
alias Pleroma.Plugs.InstanceStatic
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Web.InstanceDocument alias Pleroma.Web.InstanceDocument
alias Pleroma.Web.Plugs.InstanceStatic
alias Pleroma.Web.Plugs.OAuthScopesPlug
plug(Pleroma.Web.ApiSpec.CastAndValidate) plug(Pleroma.Web.ApiSpec.CastAndValidate)

0
lib/pleroma/web/fed_sockets/fed_sockets.ex → lib/pleroma/web/fed_sockets.ex
View File

0
test/web/activity_pub/object_validators/article_note_validator_test.exs → test/pleroma/web/activity_pub/object_validators/article_note_validator_test.exs
View File

0
test/web/activity_pub/transmogrifier/article_handling_test.exs → test/pleroma/web/activity_pub/transmogrifier/article_handling_test.exs
View File

0
test/web/activity_pub/transmogrifier/video_handling_test.exs → test/pleroma/web/activity_pub/transmogrifier/video_handling_test.exs
View File

0
test/web/admin_api/controllers/chat_controller_test.exs → test/pleroma/web/admin_api/controllers/chat_controller_test.exs
View File

0
test/web/admin_api/controllers/instance_document_controller_test.exs → test/pleroma/web/admin_api/controllers/instance_document_controller_test.exs
View File

0
test/web/fed_sockets/fed_registry_test.exs → test/pleroma/web/fed_sockets/fed_registry_test.exs
View File

0
test/web/fed_sockets/fetch_registry_test.exs → test/pleroma/web/fed_sockets/fetch_registry_test.exs
View File

0
test/web/fed_sockets/socket_info_test.exs → test/pleroma/web/fed_sockets/socket_info_test.exs
View File