Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

adc96d42

Commit adc96d42 authored 4 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'erikj/media_spam_checker' into develop

parents 982d9eb2 7e8083eb

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/9311.feature 1 addition, 0 deletions

changelog.d/9311.feature
docs/spam_checker.md 3 additions, 0 deletions

docs/spam_checker.md
synapse/events/spamcheck.py 47 additions, 0 deletions

synapse/events/spamcheck.py
synapse/rest/media/v1/media_storage.py 56 additions, 3 deletions

synapse/rest/media/v1/media_storage.py
synapse/rest/media/v1/upload_resource.py 9 additions, 3 deletions

synapse/rest/media/v1/upload_resource.py
tests/rest/media/v1/test_media_storage.py 94 additions, 0 deletions

tests/rest/media/v1/test_media_storage.py

with 210 additions and 6 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