Commit e9f825a5 by Mike Burns

Re-write to remove an if surprise

parent 1ded077b
...@@ -9,7 +9,10 @@ module Paperclip ...@@ -9,7 +9,10 @@ module Paperclip
ActiveSupport.on_load :active_record do ActiveSupport.on_load :active_record do
Paperclip::Railtie.insert Paperclip::Railtie.insert
end end
Paperclip::Attachment.default_options.merge!(app.config.paperclip_defaults) if app.config.respond_to?(:paperclip_defaults)
if app.config.respond_to?(:paperclip_defaults)
Paperclip::Attachment.default_options.merge!(app.config.paperclip_defaults)
end
end end
rake_tasks { load "tasks/paperclip.rake" } rake_tasks { load "tasks/paperclip.rake" }
......
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