Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

a47636c5

Unverified Commit a47636c5 authored 2 years ago by Andrew Morgan Committed by GitHub 2 years ago

Downloads
- Patches
- Plain Diff

Prevent local quarantined media from being claimed by media retention (#12972)

parent f7baffd8

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

changelog.d/12972.feature
docs/usage/configuration/config_documentation.md 6 additions, 0 deletions

docs/usage/configuration/config_documentation.md
synapse/rest/admin/media.py 3 additions, 5 deletions

synapse/rest/admin/media.py
synapse/rest/media/v1/media_repository.py 16 additions, 6 deletions

synapse/rest/media/v1/media_repository.py
synapse/storage/databases/main/media_repository.py 63 additions, 5 deletions

synapse/storage/databases/main/media_repository.py
tests/rest/media/test_media_retention.py 96 additions, 13 deletions

tests/rest/media/test_media_retention.py

with 185 additions and 29 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