Merge branch 'master' into feature-limited-visibility-bearcaps

98a2603d · Takeshi Umeda · GitHub · 7cd4ed7d · 087ed843 · 98a2603d
Unverified Commit 98a2603d authored 4 years ago by Takeshi Umeda Committed by GitHub 4 years ago
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 2327 additions and 1794 deletions
+2327 -1794
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
--- a/spec/services/resolve_url_service_spec.rb
+++ b/spec/services/resolve_url_service_spec.rb
--- a/spec/services/unallow_domain_service_spec.rb
+++ b/spec/services/unallow_domain_service_spec.rb
--- a/spec/workers/activitypub/delivery_worker_spec.rb
+++ b/spec/workers/activitypub/delivery_worker_spec.rb
--- a/spec/workers/refollow_worker_spec.rb
+++ b/spec/workers/refollow_worker_spec.rb
--- a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
--- a/streaming/index.js
+++ b/streaming/index.js
--- a/yarn.lock
+++ b/yarn.lock