Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

005b4194

Commit 005b4194 authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'bugfix/trans_fix_url_videos' into 'develop'

Fix "url" of Videos in transmogrifier

Closes #367

See merge request pleroma/pleroma!459

parents a3e33fa1 a2bceaf6

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/activity_pub/transmogrifier.ex 25 additions, 4 deletions

lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/mastodon_api/views/status_view.ex 0 additions, 1 deletion

lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/twitter_api/representers/activity_representer.ex 1 addition, 8 deletions

...roma/web/twitter_api/representers/activity_representer.ex
lib/pleroma/web/twitter_api/views/activity_view.ex 2 additions, 1 deletion

lib/pleroma/web/twitter_api/views/activity_view.ex
test/web/activity_pub/transmogrifier_test.exs 30 additions, 0 deletions

test/web/activity_pub/transmogrifier_test.exs
test/web/mastodon_api/status_view_test.exs 18 additions, 0 deletions

test/web/mastodon_api/status_view_test.exs
test/web/twitter_api/views/activity_view_test.exs 21 additions, 0 deletions

test/web/twitter_api/views/activity_view_test.exs

with 97 additions and 14 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