Commit 13ace35a authored by Angelina Filippova's avatar Angelina Filippova

Merge branch 'feature/add-s3-settings' into 'develop'

Add ability to S3 settings on Uploads tab

Closes pleroma#1924

See merge request !141
parents 91ccbfed 55cf52f4
Pipeline #28442 passed with stages
in 10 minutes and 22 seconds
......@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](
- Support pagination of local emoji packs and files
- Add MRF Activity Expiration setting
- Add ability to disable multi-factor authentication for a user
- Ability to configure S3 settings on Upload tab
### Changed
......@@ -8,6 +8,10 @@
<setting :setting-group="uploadersLocal" :data="uploadersLocalData"/>
<el-divider v-if="uploadersLocal" class="divider thick-line"/>
<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 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'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment