Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
5f2071c4
Verified
Commit
5f2071c4
authored
Sep 19, 2020
by
Alexander Strizhakov
Browse files
changes after rebase
parent
bb111465
Changes
11
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/admin_api/controllers/chat_controller.ex
View file @
5f2071c4
...
...
@@ -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
...
...
lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
View file @
5f2071c4
...
...
@@ -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
)
...
...
lib/pleroma/web/fed_sockets
/fed_sockets
.ex
→
lib/pleroma/web/fed_sockets.ex
View file @
5f2071c4
File moved
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 @
5f2071c4
File moved
test/web/activity_pub/transmogrifier/article_handling_test.exs
→
test/
pleroma/
web/activity_pub/transmogrifier/article_handling_test.exs
View file @
5f2071c4
File moved
test/web/activity_pub/transmogrifier/video_handling_test.exs
→
test/
pleroma/
web/activity_pub/transmogrifier/video_handling_test.exs
View file @
5f2071c4
File moved
test/web/admin_api/controllers/chat_controller_test.exs
→
test/
pleroma/
web/admin_api/controllers/chat_controller_test.exs
View file @
5f2071c4
File moved
test/web/admin_api/controllers/instance_document_controller_test.exs
→
test/
pleroma/
web/admin_api/controllers/instance_document_controller_test.exs
View file @
5f2071c4
File moved
test/web/fed_sockets/fed_registry_test.exs
→
test/
pleroma/
web/fed_sockets/fed_registry_test.exs
View file @
5f2071c4
File moved
test/web/fed_sockets/fetch_registry_test.exs
→
test/
pleroma/
web/fed_sockets/fetch_registry_test.exs
View file @
5f2071c4
File moved
test/web/fed_sockets/socket_info_test.exs
→
test/
pleroma/
web/fed_sockets/socket_info_test.exs
View file @
5f2071c4
File moved
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment