Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

3f65f2ea

Commit 3f65f2ea authored 4 years ago by feld

Downloads
- Plain Diff

Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'

Support for hosts with scheme in MediaProxy whitelist setting

Closes #1922

See merge request pleroma/pleroma!2754

parents 63798e89 b3764423

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
config/description.exs 2 additions, 2 deletions

config/description.exs
config/test.exs 5 additions, 0 deletions

config/test.exs
docs/configuration/cheatsheet.md 6 additions, 3 deletions

docs/configuration/cheatsheet.md
lib/pleroma/config/deprecation_warnings.ex 14 additions, 1 deletion

lib/pleroma/config/deprecation_warnings.ex
lib/pleroma/plugs/http_security_plug.ex 32 additions, 15 deletions

lib/pleroma/plugs/http_security_plug.ex
lib/pleroma/web/media_proxy/media_proxy.ex 16 additions, 10 deletions

lib/pleroma/web/media_proxy/media_proxy.ex
test/config/deprecation_warnings_test.exs 8 additions, 0 deletions

test/config/deprecation_warnings_test.exs
test/plugs/http_security_plug_test.exs 69 additions, 21 deletions

test/plugs/http_security_plug_test.exs
test/web/media_proxy/media_proxy_controller_test.exs 87 additions, 51 deletions

test/web/media_proxy/media_proxy_controller_test.exs
test/web/media_proxy/media_proxy_test.exs 44 additions, 98 deletions

test/web/media_proxy/media_proxy_test.exs

with 284 additions and 201 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