Ivan Tashkinov 829e997223 [#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests ... # Conflicts: # lib/pleroma/object.ex # test/web/activity_pub/transmogrifier_test.exs # test/web/ostatus/ostatus_test.exs		2019-07-09 21:46:16 +03:00
..
mrf	test: add tests for mediaproxy warming policy	2019-06-28 23:41:42 +00:00
transmogrifier	Transmogrifier: Add tests for incoming follows to locked accounts.	2019-06-05 14:10:46 +02:00
views	[#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.	2019-07-08 19:53:02 +03:00
activity_pub_controller_test.exs	[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests	2019-07-09 21:46:16 +03:00
activity_pub_test.exs	[#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.	2019-07-08 19:53:02 +03:00
relay_test.exs	tests: add legal boilerplate	2018-12-23 20:57:10 +00:00
transmogrifier_test.exs	[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests	2019-07-09 21:46:16 +03:00
utils_test.exs	Utils: Split update_follow_state and update_follow_state_for_all.	2019-06-05 16:43:35 +02:00
visibilty_test.exs	add option skip_thread_containment	2019-06-03 16:13:37 +03:00