lib/paperclip/railtie.rb in paperclip-3.0.4 vs lib/paperclip/railtie.rb in paperclip-3.1.0

@@ -3,12 +3,16 @@
 
 module Paperclip
   require 'rails'
 
   class Railtie < Rails::Railtie
-    initializer 'paperclip.insert_into_active_record' do
+    initializer 'paperclip.insert_into_active_record' do |app|
       ActiveSupport.on_load :active_record do
         Paperclip::Railtie.insert
+      end
+
+      if app.config.respond_to?(:paperclip_defaults)
+        Paperclip::Attachment.default_options.merge!(app.config.paperclip_defaults)
       end
     end
 
     rake_tasks { load "tasks/paperclip.rake" }
   end