From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 26 Oct 2020 14:47:21 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9c34090db84fc28bf6c40da700095f025f1887ea;p=mastodon.git

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

Conflicts:
- `app/services/process_mentions_service.rb`:
  glitch-soc local-only handling, ported upstream changes
---

9c34090db84fc28bf6c40da700095f025f1887ea
diff --cc app/services/process_mentions_service.rb
index d5ea69da1,4c02c7865..570cd8272
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@@ -59,8 -59,8 +59,8 @@@ class ProcessMentionsService < BaseServ
  
      if mentioned_account.local?
        LocalNotificationWorker.perform_async(mentioned_account.id, mention.id, mention.class.name, :mention)
 -    elsif mentioned_account.activitypub?
 +    elsif mentioned_account.activitypub? && !@status.local_only?
-       ActivityPub::DeliveryWorker.perform_async(activitypub_json, mention.status.account_id, mentioned_account.inbox_url)
+       ActivityPub::DeliveryWorker.perform_async(activitypub_json, mention.status.account_id, mentioned_account.inbox_url, { synchronize_followers: !mention.status.distributable? })
      end
    end
  
diff --cc package.json
index 5d07f31a5,e13f4f704..84dfb8a64
--- a/package.json
+++ b/package.json
@@@ -60,20 -59,19 +60,20 @@@
    },
    "private": true,
    "dependencies": {
-     "@babel/core": "^7.11.6",
+     "@babel/core": "^7.12.3",
      "@babel/plugin-proposal-class-properties": "^7.8.3",
-     "@babel/plugin-proposal-decorators": "^7.10.5",
-     "@babel/plugin-transform-react-inline-elements": "^7.10.4",
-     "@babel/plugin-transform-runtime": "^7.11.5",
-     "@babel/preset-env": "^7.11.5",
-     "@babel/preset-react": "^7.10.4",
-     "@babel/runtime": "^7.11.2",
+     "@babel/plugin-proposal-decorators": "^7.12.1",
+     "@babel/plugin-transform-react-inline-elements": "^7.12.1",
+     "@babel/plugin-transform-runtime": "^7.12.1",
+     "@babel/preset-env": "^7.12.1",
+     "@babel/preset-react": "^7.12.1",
+     "@babel/runtime": "^7.12.1",
      "@clusterws/cws": "^3.0.0",
      "@gamestdio/websocket": "^0.3.2",
-     "@github/webauthn-json": "^0.5.6",
+     "@github/webauthn-json": "^0.5.7",
      "@rails/ujs": "^6.0.3",
      "array-includes": "^3.1.1",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.6",
      "axios": "^0.20.0",