Merge remote-tracking branch 'tootsuite/main' into custom/quote

# Conflicts: # app/services/fetch_link_card_service.rb
2022-02-01 05:20:21 +00:00
parent e7eab1a6ae 54581d43e7
commit 71530857a5
760 changed files with 23758 additions and 10910 deletions
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -60,7 +60,7 @@ class Api::V1::StatusesController < Api::BaseController
    authorize @status, :destroy?

    @status.discard
-    RemovalWorker.perform_async(@status.id, redraft: true)
+    RemovalWorker.perform_async(@status.id, { 'redraft' => true })
    @status.account.statuses_count = @status.account.statuses_count - 1

    render json: @status, serializer: REST::StatusSerializer, source_requested: true