diff --git a/app/assets/javascripts/admin/addon/templates/backups-index.hbs b/app/assets/javascripts/admin/addon/templates/backups-index.hbs index 7c30f00ef09..cf84d858f81 100644 --- a/app/assets/javascripts/admin/addon/templates/backups-index.hbs +++ b/app/assets/javascripts/admin/addon/templates/backups-index.hbs @@ -1,22 +1,8 @@
{{#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}} diff --git a/config/site_settings.yml b/config/site_settings.yml index 9fdb285cf34..fcd3cde83a3 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -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 diff --git a/db/migrate/20211220023034_remove_experimental_backup_uploader_setting.rb b/db/migrate/20211220023034_remove_experimental_backup_uploader_setting.rb new file mode 100644 index 00000000000..18df03b980c --- /dev/null +++ b/db/migrate/20211220023034_remove_experimental_backup_uploader_setting.rb @@ -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