aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-07-26 15:27:12 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-07-26 15:27:12 +0000
commit46e8b68093bc29d3f6a49e306dca0d11834a93b6 (patch)
tree87c51838fc03ad2fb03793111a40fef821ab2b0b
parentd1e891062e3c6c34ca7940a476917beea2822ca2 (diff)
parent7c8abbcb1ccafa79372fd75fdec87db2207b61ec (diff)
downloadpleroma-46e8b68093bc29d3f6a49e306dca0d11834a93b6.tar.gz
Merge branch 'changelog/1484-base_url-remove-media' into 'develop'
Changelog: !1484 base_url removed /media/ See merge request pleroma/pleroma!1494
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3f54d19e..bd3048b19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]
### Changed
- **Breaking:** Configuration: A setting to explicitly disable the mailer was added, defaulting to true, if you are using a mailer add `config :pleroma, Pleroma.Emails.Mailer, enabled: true` to your config
+- **Breaking:** Configuration: `/media/` is now removed when `base_url` is configured, append `/media/` to your `base_url` config to keep the old behaviour if desired
- Configuration: OpenGraph and TwitterCard providers enabled by default
- Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text
- Federation: Return 403 errors when trying to request pages from a user's follower/following collections if they have `hide_followers`/`hide_follows` set