Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

9ad30520

Commit 9ad30520 authored 4 years ago by lain

Downloads
- Plain Diff

Merge branch 'bugfix/peertube-videos' into 'develop'

Fix getting videos from peertube

See merge request pleroma/pleroma!2728

parents fa0fa455 fbb9743a

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/activity_pub/transmogrifier.ex 23 additions, 11 deletions

lib/pleroma/web/activity_pub/transmogrifier.ex
test/fixtures/tesla_mock/framatube.org-video.json 1 addition, 0 deletions

test/fixtures/tesla_mock/framatube.org-video.json
test/fixtures/tesla_mock/https___framatube.org_accounts_framasoft.json 1 addition, 0 deletions

.../tesla_mock/https___framatube.org_accounts_framasoft.json
test/support/http_request_mock.ex 16 additions, 0 deletions

test/support/http_request_mock.ex
test/web/activity_pub/transmogrifier_test.exs 35 additions, 13 deletions

test/web/activity_pub/transmogrifier_test.exs

with 76 additions and 24 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment