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

3f42806b

Commit 3f42806b authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'develop' into 'develop'

Dedupe uploads

See merge request pleroma/pleroma!115

parents 564c73ab f34232da

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/mix/tasks/sample_config.eex 2 additions, 1 deletion

lib/mix/tasks/sample_config.eex
lib/pleroma/upload.ex 88 additions, 26 deletions

lib/pleroma/upload.ex
lib/pleroma/web/activity_pub/activity_pub.ex 1 addition, 1 deletion

lib/pleroma/web/activity_pub/activity_pub.ex
test/upload_test.exs 21 additions, 16 deletions

test/upload_test.exs

with 112 additions and 44 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