github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 10:57:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Promote uppy backup uploader to primary uploader (#15363)

Browse Source 
This commit removes the enable_experimental_backup_uploader site
setting and the flags in backups-index.hbs to make the uppy
backup uploader the main one from now on.

A follow-up commit will delete the old backup uploader code and
also remove resumable.js from the project.
This commit is contained in:
Martin Brennan 2021-12-20 13:39:35 +10:00 committed by GitHub
parent b6c3e9aa03
commit d5e380e5c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/admin/addon/templates/backups-index.hbs
View File

@ -1,22 +1,8 @@
<div class="backup-options">
{{#if localBackupStorage}}
{{#if siteSettings.enable_experimental_backup_uploader}}
{{uppy-backup-uploader done=(route-action "uploadSuccess") localBackupStorage=localBackupStorage}}
{{else}}
{{resumable-upload
target="/admin/backups/upload"
success=(route-action "uploadSuccess")
error=(route-action "uploadError")
uploadText=uploadLabel
title="admin.backups.upload.title"
class="btn-default"}}
{{/if}}
{{uppy-backup-uploader done=(route-action "uploadSuccess") localBackupStorage=localBackupStorage}}
{{else}}
{{#if siteSettings.enable_experimental_backup_uploader}}
{{uppy-backup-uploader done=(route-action "remoteUploadSuccess")}}
{{else}}
{{backup-uploader done=(route-action "remoteUploadSuccess")}}
{{/if}}
{{uppy-backup-uploader done=(route-action "remoteUploadSuccess")}}
{{/if}}
{{#if site.isReadOnly}}

4
config/site_settings.yml
View File

@ -273,10 +273,6 @@ basic:
client: true
default: false
hidden: true
enable_experimental_backup_uploader:
client: true
default: false
hidden: true
enable_direct_s3_uploads:
client: true
default: false

14
db/migrate/20211220023034_remove_experimental_backup_uploader_setting.rb Normal file
View File

@ -0,0 +1,14 @@
# frozen_string_literal: true
class RemoveExperimentalBackupUploaderSetting < ActiveRecord::Migration[6.1]
def up
execute <<~SQL
DELETE FROM site_settings
WHERE name = 'enable_experimental_backup_uploader'
SQL
end
def down
raise ActiveRecord::IrreversibleMigration
end
end