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

44913c10

Commit 44913c10 authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'bugfix/rich-media-non-unicode' into 'develop'

rich media non-unicode bugfix

See merge request pleroma/pleroma!749

parents dea33f4a 106475f2

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/rich_media/parser.ex 25 additions, 3 deletions

lib/pleroma/web/rich_media/parser.ex
test/fixtures/rich_media/malformed-data.html 4874 additions, 0 deletions

test/fixtures/rich_media/malformed-data.html
test/support/http_request_mock.ex 45 additions, 10 deletions

test/support/http_request_mock.ex
test/web/rich_media/parser_test.exs 4 additions, 0 deletions

test/web/rich_media/parser_test.exs

with 4948 additions and 13 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