projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1d0e130
)
changes after rebase
author
Alexander Strizhakov
<alex.strizhakov@gmail.com>
Sun, 16 Aug 2020 18:01:38 +0000
(21:01 +0300)
committer
Alexander Strizhakov
<alex.strizhakov@gmail.com>
Tue, 13 Oct 2020 13:44:02 +0000
(16:44 +0300)
17 files changed:
lib/pleroma/http/middleware/connection_pool.ex
[moved from
lib/pleroma/tesla/middleware/connection_pool.ex
with 100% similarity]
patch
|
blob
|
history
test/pleroma/gun/connection_pool_test.exs
[moved from
test/gun/conneciton_pool_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/repo/migrations/autolinker_to_linkify_test.exs
[moved from
test/migrations/20200716195806_autolinker_to_linkify_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/repo/migrations/fix_legacy_tags_test.exs
[moved from
test/migrations/20200802170532_fix_legacy_tags_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/repo/migrations/fix_malformed_formatter_config_test.exs
[moved from
test/migrations/20200722185515_fix_malformed_formatter_config_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/repo/migrations/move_welcome_settings_test.exs
[moved from
test/migrations/20200724133313_move_welcome_settings_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/report_note_test.exs
[moved from
test/report_note_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/user/welcome_chat_message_test.exs
[moved from
test/user/welcome_chat_massage_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/user/welcome_email_test.exs
[moved from
test/user/welcome_email_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/user/welcome_message_test.exs
[moved from
test/user/welcome_message_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/web/activity_pub/object_validators/accept_validation_test.exs
[moved from
test/web/activity_pub/object_validators/accept_validation_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/web/activity_pub/object_validators/reject_validation_test.exs
[moved from
test/web/activity_pub/object_validators/reject_validation_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs
[moved from
test/web/activity_pub/transmogrifier/accept_handling_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs
[moved from
test/web/activity_pub/transmogrifier/answer_handling_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
[moved from
test/web/activity_pub/transmogrifier/question_handling_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs
[moved from
test/web/activity_pub/transmogrifier/reject_handling_test.exs
with 100% similarity]
patch
|
blob
|
history
test/pleroma/web/plugs/frontend_static_plug_test.exs
[moved from
test/plugs/frontend_static_test.exs
with 92% similarity]
patch
|
blob
|
history
diff --git
a/lib/pleroma/tesla/middleware/connection_pool.ex
b/lib/pleroma/http/middleware/connection_pool.ex
similarity index 100%
rename from
lib/pleroma/tesla/middleware/connection_pool.ex
rename to
lib/pleroma/http/middleware/connection_pool.ex
diff --git
a/test/gun/conneciton_pool_test.exs
b/test/pleroma/gun/connection_pool_test.exs
similarity index 100%
rename from
test/gun/conneciton_pool_test.exs
rename to
test/pleroma/gun/connection_pool_test.exs
diff --git
a/test/migrations/20200716195806_autolinker_to_linkify_test.exs
b/test/pleroma/repo/migrations/autolinker_to_linkify_test.exs
similarity index 100%
rename from
test/migrations/20200716195806_autolinker_to_linkify_test.exs
rename to
test/pleroma/repo/migrations/autolinker_to_linkify_test.exs
diff --git
a/test/migrations/20200802170532_fix_legacy_tags_test.exs
b/test/pleroma/repo/migrations/fix_legacy_tags_test.exs
similarity index 100%
rename from
test/migrations/20200802170532_fix_legacy_tags_test.exs
rename to
test/pleroma/repo/migrations/fix_legacy_tags_test.exs
diff --git
a/test/migrations/20200722185515_fix_malformed_formatter_config_test.exs
b/test/pleroma/repo/migrations/fix_malformed_formatter_config_test.exs
similarity index 100%
rename from
test/migrations/20200722185515_fix_malformed_formatter_config_test.exs
rename to
test/pleroma/repo/migrations/fix_malformed_formatter_config_test.exs
diff --git
a/test/migrations/20200724133313_move_welcome_settings_test.exs
b/test/pleroma/repo/migrations/move_welcome_settings_test.exs
similarity index 100%
rename from
test/migrations/20200724133313_move_welcome_settings_test.exs
rename to
test/pleroma/repo/migrations/move_welcome_settings_test.exs
diff --git
a/test/report_note_test.exs
b/test/pleroma/report_note_test.exs
similarity index 100%
rename from
test/report_note_test.exs
rename to
test/pleroma/report_note_test.exs
diff --git
a/test/user/welcome_chat_massage_test.exs
b/test/pleroma/user/welcome_chat_message_test.exs
similarity index 100%
rename from
test/user/welcome_chat_massage_test.exs
rename to
test/pleroma/user/welcome_chat_message_test.exs
diff --git
a/test/user/welcome_email_test.exs
b/test/pleroma/user/welcome_email_test.exs
similarity index 100%
rename from
test/user/welcome_email_test.exs
rename to
test/pleroma/user/welcome_email_test.exs
diff --git
a/test/user/welcome_message_test.exs
b/test/pleroma/user/welcome_message_test.exs
similarity index 100%
rename from
test/user/welcome_message_test.exs
rename to
test/pleroma/user/welcome_message_test.exs
diff --git
a/test/web/activity_pub/object_validators/accept_validation_test.exs
b/test/pleroma/web/activity_pub/object_validators/accept_validation_test.exs
similarity index 100%
rename from
test/web/activity_pub/object_validators/accept_validation_test.exs
rename to
test/pleroma/web/activity_pub/object_validators/accept_validation_test.exs
diff --git
a/test/web/activity_pub/object_validators/reject_validation_test.exs
b/test/pleroma/web/activity_pub/object_validators/reject_validation_test.exs
similarity index 100%
rename from
test/web/activity_pub/object_validators/reject_validation_test.exs
rename to
test/pleroma/web/activity_pub/object_validators/reject_validation_test.exs
diff --git
a/test/web/activity_pub/transmogrifier/accept_handling_test.exs
b/test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs
similarity index 100%
rename from
test/web/activity_pub/transmogrifier/accept_handling_test.exs
rename to
test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs
diff --git
a/test/web/activity_pub/transmogrifier/answer_handling_test.exs
b/test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs
similarity index 100%
rename from
test/web/activity_pub/transmogrifier/answer_handling_test.exs
rename to
test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs
diff --git
a/test/web/activity_pub/transmogrifier/question_handling_test.exs
b/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
similarity index 100%
rename from
test/web/activity_pub/transmogrifier/question_handling_test.exs
rename to
test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
diff --git
a/test/web/activity_pub/transmogrifier/reject_handling_test.exs
b/test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs
similarity index 100%
rename from
test/web/activity_pub/transmogrifier/reject_handling_test.exs
rename to
test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs
diff --git
a/test/plugs/frontend_static_test.exs
b/test/pleroma/web/plugs/frontend_static_plug_test.exs
similarity index 92%
rename from
test/plugs/frontend_static_test.exs
rename to
test/pleroma/web/plugs/frontend_static_plug_test.exs
index 6f49230481e80763475e0909ff973cc2c57ba69f..f6f7d7bdbec45e4382e9ae56a0d4e3d901e3847b 100644
(file)
--- a/
test/plugs/frontend_static_test.exs
+++ b/
test/pleroma/web/plugs/frontend_static_plug_test.exs
@@
-2,8
+2,7
@@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.Web.FrontendStaticPlugTest do
- alias Pleroma.Plugs.FrontendStatic
+defmodule Pleroma.Web.Plugs.FrontendStaticPlugTest do
use Pleroma.Web.ConnCase
@dir "test/tmp/instance_static"
use Pleroma.Web.ConnCase
@dir "test/tmp/instance_static"
@@
-21,7
+20,7
@@
defmodule Pleroma.Web.FrontendStaticPlugTest do
at: "/admin",
frontend_type: :admin
]
at: "/admin",
frontend_type: :admin
]
- |> FrontendStatic.init()
+ |>
Pleroma.Web.Plugs.
FrontendStatic.init()
assert opts[:at] == ["admin"]
assert opts[:frontend_type] == :admin
assert opts[:at] == ["admin"]
assert opts[:frontend_type] == :admin