Commit 8fb03315 by Prem Sichanugrist

Make sure the `aws/sdk` patch got picked up

parent b48ec849
......@@ -85,6 +85,10 @@ module Paperclip
def self.extended base
begin
require 'aws-sdk'
rescue LoadError => e
e.message << " (You may need to install the aws-sdk gem)"
raise e
end unless defined?(AWS::Core)
# Overriding AWS::Core::LogFormatter to make sure it return a UTF-8 string
if AWS::VERSION >= "1.3.9"
......@@ -100,10 +104,6 @@ module Paperclip
end
end
end
rescue LoadError => e
e.message << " (You may need to install the aws-sdk gem)"
raise e
end unless defined?(AWS::Core)
base.instance_eval do
@s3_options = @options[:s3_options] || {}
......
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