lib/ab_admin/carrierwave/glue.rb in ab_admin-0.6.1 vs lib/ab_admin/carrierwave/glue.rb in ab_admin-0.7.0

- old
+ new

@@ -1,17 +1,15 @@ -# encoding: utf-8 module AbAdmin module CarrierWave module Glue extend ActiveSupport::Concern module ClassMethods def ab_admin_uploader(uploader=nil, options={}, &block) - options = { mount_on: :data_file_name }.merge(options) + options.reverse_merge!(mount_on: :data_file_name) + options.merge!(validate_integrity: false, validate_processing: false, validate_download: false) unless uploader.try!(:enable_processing) mount_uploader(:data, uploader, options, &block) - - validates_processing_of :data end def sunrise_uploader(*args) ActiveSupport::Deprecation.warn('`sunrise_uploader` is deprecated, use `ab_admin_uploader` instead') ab_admin_uploader(*args)