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

Conflicts:
- `Gemfile.lock`:
  Upstream-updated lib textually too close to glitch-soc-only dep.
  Updated like upstream.

diff --cc Gemfile
index bcda409a90acfdc394fcb9d50bc0f3d37007bd12,afed1ac94b5627b010617982589fad68744b8d46..1ddb6f383aca36836a3260166a1cc35d7bba835a
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -97,10 -97,8 +97,10 @@@ gem 'webauthn', '~> 3.0.0.alpha1
  
  gem 'json-ld'
  gem 'json-ld-preloaded', '~> 3.2'
- gem 'rdf-normalize', '~> 0.4'
+ gem 'rdf-normalize', '~> 0.5'
  
 +gem 'redcarpet', '~> 3.5'
 +
  group :development, :test do
    gem 'fabrication', '~> 2.24'
    gem 'fuubar', '~> 2.5'

diff --cc Gemfile.lock
index bf6b5474fd95f57b5f37b6a00ed71e1b5e1b15ec,dc5b339648957c718b1c5cdaf5ccf15e74102184..545032b2a459f4299abe47818a8eee8bed4e1b39
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -493,9 -491,8 +493,9 @@@ GE
      rake (13.0.6)
      rdf (3.2.3)
        link_header (~> 0.0, >= 0.0.8)
-     rdf-normalize (0.4.0)
-       rdf (~> 3.1)
+     rdf-normalize (0.5.0)
+       rdf (~> 3.2)
 +    redcarpet (3.5.1)
      redis (4.5.1)
      redis-namespace (1.8.1)
        redis (>= 3.0.4)
@@@ -770,8 -766,7 +770,8 @@@ DEPENDENCIE
    rails-controller-testing (~> 1.0)
    rails-i18n (~> 6.0)
    rails-settings-cached (~> 0.6)
-   rdf-normalize (~> 0.4)
+   rdf-normalize (~> 0.5)
 +  redcarpet (~> 3.5)
    redis (~> 4.5)
    redis-namespace (~> 1.8)
    rexml (~> 3.2)

diff --cc app/controllers/api/v1/statuses_controller.rb
Simple merge

diff --cc app/lib/activitypub/activity/create.rb
Simple merge

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc app/services/fan_out_on_write_service.rb
Simple merge

diff --cc app/services/reblog_service.rb
Simple merge

diff --cc app/workers/feed_insert_worker.rb
Simple merge

diff --cc package.json
index 00a9ce37a5e63e5e142bdecfd1d7a532e3d9e824,e6e9e7a647871bd121d487c290ed961ea7de1da9..921958803f9ae95b66f870b1aeec65ff6312d193
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -72,10 -71,9 +72,10 @@@
      "@github/webauthn-json": "^0.5.7",
      "@rails/ujs": "^6.1.4",
      "array-includes": "^3.1.4",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.8",
-     "axios": "^0.24.0",
+     "axios": "^0.25.0",
      "babel-loader": "^8.2.3",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^5.0.0",

diff --cc spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Simple merge

diff --cc spec/controllers/api/v1/timelines/public_controller_spec.rb
Simple merge

diff --cc spec/controllers/application_controller_spec.rb
Simple merge

diff --cc spec/models/public_feed_spec.rb
Simple merge

diff --cc yarn.lock
Simple merge