]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 7 Sep 2020 07:21:38 +0000 (09:21 +0200)
committerThibaut Girka <thib@sitedethib.com>
Mon, 7 Sep 2020 07:21:38 +0000 (09:21 +0200)
commite5f934ddf0aa4ef9efbf45751bc00bebff768d99
tree322231d7d50704edf8da762b69ee22c9850f2ce3
parentd967251fdc3826ad27d30e55258cfa4cdfd7c871
parenta6121a159c5305ea9faa95743a50babb23ab41cd
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes.
app/controllers/activitypub/collections_controller.rb
app/lib/activitypub/adapter.rb
config/routes.rb
spec/lib/feed_manager_spec.rb