Commit cf41b01c by John Hawthorn Committed by Jon Yurek

performance: only require 'aws/s3' if it isn't already loaded

parent 9ec35a6d
...@@ -63,7 +63,7 @@ module Paperclip ...@@ -63,7 +63,7 @@ module Paperclip
rescue LoadError => e rescue LoadError => e
e.message << " (You may need to install the aws-s3 gem)" e.message << " (You may need to install the aws-s3 gem)"
raise e raise e
end end unless defined?(AWS::S3)
base.instance_eval do base.instance_eval do
@s3_credentials = parse_credentials(@options[:s3_credentials]) @s3_credentials = parse_credentials(@options[:s3_credentials])
......
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