Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.

diff --cc app/javascript/styles/mastodon/admin.scss
Simple merge

diff --cc app/services/remove_status_service.rb
index 9259c69d9f87485c505654a7c466ef4c74fb413a,3535b503be3b43f8914bd2ef459bf7e40cad76b4..2fe3bab5cb9702804c98a688f9b2fb5bcf237fe9
--- 1/app/services/remove_status_service.rb
--- 2/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@@ -136,14 -135,8 +137,14 @@@ class RemoveStatusService < BaseServic
      redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', @payload)
    end
  
 +  def remove_from_direct
 +    @status.active_mentions.each do |mention|
 +      FeedManager.instance.unpush_from_direct(mention.account, @status) if mention.account.local?
 +    end
 +  end
 +
    def remove_media
-     return if @options[:redraft] || (!@options[:immediate] && @status.reported?)
+     return if @options[:redraft] || !permanently?
  
      @status.media_attachments.destroy_all
    end

diff --cc app/views/admin/action_logs/index.html.haml
Simple merge

diff --cc app/views/admin/reports/show.html.haml
Simple merge

diff --cc app/views/admin/statuses/index.html.haml
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
index d357512b3e926bc1c2ab1972f0852485f00b3f89,ed615a1ee03fc62852368c26c17d14e2778f2c25..7b5a301ffe7d6f4ae4163ee436ed600a6a4b06cf
--- 1/db/schema.rb
--- 2/db/schema.rb
+++ b/db/schema.rb
@@@ -848,11 -852,10 +852,12 @@@ ActiveRecord::Schema.define(version: 20
      t.bigint "account_id", null: false
      t.bigint "application_id"
      t.bigint "in_reply_to_account_id"
 +    t.boolean "local_only"
      t.bigint "poll_id"
 +    t.string "content_type"
      t.datetime "deleted_at"
      t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)"
+     t.index ["deleted_at"], name: "index_statuses_on_deleted_at", where: "(deleted_at IS NOT NULL)"
      t.index ["id", "account_id"], name: "index_statuses_local_20190824", order: { id: :desc }, where: "((local OR (uri IS NULL)) AND (deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
      t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
      t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"