]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Fri, 28 Jan 2022 07:58:32 +0000 (08:58 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Fri, 28 Jan 2022 07:58:32 +0000 (08:58 +0100)
commitb2915613fb247597d3de2f80c2c007b3369ac5bb
tree745c245cb4c2d16dcada37d1fb1cf5b13f4e2493
parentad6ddb9bdd3ceae3f9d5dde7b351081f0dfa2a9a
parente38fc319dc6897ca867a509b0c7a5878d34d0f00
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.
14 files changed:
Gemfile
Gemfile.lock
app/controllers/api/v1/statuses_controller.rb
app/lib/activitypub/activity/create.rb
app/lib/feed_manager.rb
app/services/fan_out_on_write_service.rb
app/services/reblog_service.rb
app/workers/feed_insert_worker.rb
package.json
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
spec/controllers/api/v1/timelines/public_controller_spec.rb
spec/controllers/application_controller_spec.rb
spec/models/public_feed_spec.rb
yarn.lock