Merge branch 'develop' into 'feature/cache-invalidation'

# Conflicts:
#   CHANGELOG.md

CHANGELOG.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add ability to disable multi-factor authentication for a user
 - Add ability to manually evict and ban URLs from the Pleroma MediaProxy cache
 - Add Invalidation settings on MediaProxy tab
+- Ability to configure S3 settings on Upload tab
 
 ### Changed
 

src/views/settings/components/Upload.vue

@@ -8,6 +8,10 @@
       <setting :setting-group="uploadersLocal" :data="uploadersLocalData"/>
       <el-divider v-if="uploadersLocal" class="divider thick-line"/>
     </el-form>
+    <el-form v-if="showUploadersS3" :model="s3Data" :label-position="labelPosition" :label-width="labelWidth">
+      <setting :setting-group="s3" :data="s3Data"/>
+      <el-divider v-if="s3" class="divider thick-line"/>
+    </el-form>
     <el-form v-if="showUploadersS3" :model="uploadersS3Data" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="uploadersS3" :data="uploadersS3Data"/>
       <el-divider v-if="uploadersS3" class="divider thick-line"/>
@@ -62,6 +66,12 @@ export default {
     loading() {
       return this.settings.loading
     },
+    s3() {
+      return this.settings.description.find(setting => setting.key === ':s3')
+    },
+    s3Data() {
+      return _.get(this.settings.settings, [':ex_aws', ':s3']) || {}
+    },
     showUploadersS3() {
       const uploader = _.get(this.settings.settings, [':pleroma', 'Pleroma.Upload', ':uploader'])
       return uploader === 'Pleroma.Uploaders.S3'