Merge branch 'deprecate-public_endpoint' into 'develop'
authorfeld <feld@feld.me>
Wed, 20 Jan 2021 22:48:48 +0000 (22:48 +0000)
committerfeld <feld@feld.me>
Wed, 20 Jan 2021 22:48:48 +0000 (22:48 +0000)
Deprecate Uploaders.S3, :public_endpoint

See merge request pleroma/pleroma!3251

13 files changed:
1  2 
CHANGELOG.md
config/config.exs
config/test.exs
lib/pleroma/config/deprecation_warnings.ex
lib/pleroma/upload.ex
test/pleroma/config/deprecation_warnings_test.exs
test/pleroma/object_test.exs
test/pleroma/scheduled_activity_test.exs
test/pleroma/upload_test.exs
test/pleroma/uploaders/s3_test.exs
test/pleroma/user/backup_test.exs
test/support/data_case.ex
test/support/helpers.ex

diff --cc CHANGELOG.md
Simple merge
Simple merge
diff --cc config/test.exs
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge