denys/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Packages Projects Releases Wiki Activity
akkoma/test/pleroma/web
History
Ivan Tashkinov 049ece1ef3 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances 
# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex
2020-10-17 13:12:39 +03:00
..
activity_pub Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances 2020-10-17 13:12:39 +03:00
admin_api Merge branch 'develop' into refactor/discoverable_user_field 2020-10-13 09:54:11 -05:00
api_spec tests consistency 2020-10-13 16:35:09 +03:00
auth tests consistency 2020-10-13 16:35:09 +03:00
common_api tests consistency 2020-10-13 16:35:09 +03:00
fed_sockets changes after rebase 2020-10-13 16:44:03 +03:00
feed Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances 2020-10-17 13:12:39 +03:00
mastodon_api Merge branch 'feature/gen-magic' into 'develop' 2020-10-14 17:31:45 +00:00
media_proxy tests consistency 2020-10-13 16:35:09 +03:00
metadata Merge branch 'develop' into refactor/discoverable_user_field 2020-10-13 09:54:11 -05:00
o_auth tests consistency 2020-10-13 16:35:09 +03:00
o_status Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances 2020-10-17 13:12:39 +03:00
pleroma_api JPEG content_type must be image/jpeg 2020-10-13 10:37:24 -05:00
plugs JPEG content_type must be image/jpeg 2020-10-13 10:37:24 -05:00
preload/providers update files consistency after rebase 2020-10-13 16:44:00 +03:00
push JPEG content_type must be image/jpeg 2020-10-13 10:37:24 -05:00
rich_media changes after rebase 2020-10-13 17:10:34 +03:00
static_fe Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances 2020-10-17 13:12:39 +03:00
twitter_api tests consistency 2020-10-13 16:35:09 +03:00
views tests consistency 2020-10-13 16:35:09 +03:00
web_finger tests consistency 2020-10-13 16:35:09 +03:00
chat_channel_test.exs tests consistency 2020-10-13 16:35:09 +03:00
common_api_test.exs Merge branch 'feature/gen-magic' into 'develop' 2020-10-14 17:31:45 +00:00
fallback_test.exs tests consistency 2020-10-13 16:35:09 +03:00
federator_test.exs tests consistency 2020-10-13 16:35:09 +03:00
media_proxy_test.exs tests consistency 2020-10-13 16:35:09 +03:00
metadata_test.exs Merge branch 'develop' into refactor/discoverable_user_field 2020-10-13 09:54:11 -05:00
mongoose_im_controller_test.exs tests consistency 2020-10-13 16:35:09 +03:00
node_info_test.exs tests consistency 2020-10-13 16:35:09 +03:00
rel_me_test.exs tests consistency 2020-10-13 16:35:09 +03:00
streamer_test.exs tests consistency 2020-10-13 16:35:09 +03:00
uploader_controller_test.exs tests consistency 2020-10-13 16:35:09 +03:00
web_finger_test.exs tests consistency 2020-10-13 16:35:09 +03:00