Merge branch 'bugfix/mrf-ingestion' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 12:13:36 +0000 (12:13 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 16:48:33 +0000 (19:48 +0300)
commit22d49993d9ab35ff5d5276a6a1f4aec96d03b7f3
tree957224ba165c8fa73fa5f7dcfe7b97bcf7e35d1d
parenteff7f9892dbb042a447fd83e1ce5e9cb69941cf6
Merge branch 'bugfix/mrf-ingestion' into 'develop'

Bugfix: MRF and Pipeline Ingestion

See merge request pleroma/secteam/pleroma!15
12 files changed:
CHANGELOG.md
lib/pleroma/web/activity_pub/mrf.ex
lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
lib/pleroma/web/activity_pub/mrf/subchain_policy.ex
lib/pleroma/web/activity_pub/pipeline.ex
lib/pleroma/web/api_spec/operations/chat_operation.ex
lib/pleroma/web/api_spec/operations/status_operation.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
test/web/activity_pub/pipeline_test.exs
test/web/common_api/common_api_test.exs
test/web/pleroma_api/controllers/chat_controller_test.exs