Commit b09b05b4 by Mike Burns

Merge branch 'removing-bottlenecks' of https://github.com/DanielVartanov/paperclip

parents 1cee13eb ba186314
...@@ -19,6 +19,10 @@ module Paperclip ...@@ -19,6 +19,10 @@ module Paperclip
@format = definition.delete(:format) @format = definition.delete(:format)
@processors = definition.delete(:processors) @processors = definition.delete(:processors)
@other_args = definition @other_args = definition
elsif definition.is_a? String
@geometry = definition
@format = nil
@other_args = {}
else else
@geometry, @format = [definition, nil].flatten[0..1] @geometry, @format = [definition, nil].flatten[0..1]
@other_args = {} @other_args = {}
......
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