Commit 0443e805 by Isaac Betesh Committed by Jon Yurek

whitespace changes only

parent d019bcab
...@@ -114,18 +114,18 @@ module Paperclip ...@@ -114,18 +114,18 @@ module Paperclip
module S3 module S3
def self.extended base def self.extended base
unless defined?(AWS_CLASS) unless defined?(AWS_CLASS)
begin begin
require 'aws-sdk' require 'aws-sdk'
const_set('AWS_CLASS', defined?(::Aws) ? ::Aws : ::AWS) const_set('AWS_CLASS', defined?(::Aws) ? ::Aws : ::AWS)
const_set('AWS_BASE_ERROR', const_set('AWS_BASE_ERROR',
defined?(::Aws) ? Aws::Errors::ServiceError : AWS::Errors::Base) defined?(::Aws) ? Aws::Errors::ServiceError : AWS::Errors::Base)
const_set('DEFAULT_PERMISSION', const_set('DEFAULT_PERMISSION',
defined?(::AWS) ? :public_read : :'public-read') defined?(::AWS) ? :public_read : :'public-read')
rescue LoadError => e rescue LoadError => e
e.message << " (You may need to install the aws-sdk gem)" e.message << " (You may need to install the aws-sdk gem)"
raise e raise e
end end
end end
# Overriding log formatter to make sure it return a UTF-8 string # Overriding log formatter to make sure it return a UTF-8 string
......
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