Commit 2747087c by Jon Yurek

Changed string concatenation+, because ParseTree doesn't understand inline string concatenation

parent c7b802cb
...@@ -235,8 +235,8 @@ module Paperclip ...@@ -235,8 +235,8 @@ module Paperclip
# Adds errors if thumbnail creation fails. The same as specifying :whiny_thumbnails => true. # Adds errors if thumbnail creation fails. The same as specifying :whiny_thumbnails => true.
def validates_attachment_thumbnails name, options = {} def validates_attachment_thumbnails name, options = {}
warn('[DEPRECATED] validates_attachment_thumbnail is deprecated. ' warn('[DEPRECATION] validates_attachment_thumbnail is deprecated. ' +
'This validation is on by default and will be removed from future versions. ' 'This validation is on by default and will be removed from future versions. ' +
'If you wish to turn it off, supply :whiny => false in your definition.') 'If you wish to turn it off, supply :whiny => false in your definition.')
attachment_definitions[name][:whiny_thumbnails] = true attachment_definitions[name][:whiny_thumbnails] = true
end end
......
...@@ -199,8 +199,8 @@ module Paperclip ...@@ -199,8 +199,8 @@ module Paperclip
# style as arguments. This hash can be added to with your own proc if # style as arguments. This hash can be added to with your own proc if
# necessary. # necessary.
def self.interpolations def self.interpolations
warn('[DEPRECATION] Paperclip::Attachment.interpolations is deprecated ' warn('[DEPRECATION] Paperclip::Attachment.interpolations is deprecated ' +
'and will be removed from future versions. ' 'and will be removed from future versions. ' +
'Use Paperclip.interpolates instead') 'Use Paperclip.interpolates instead')
Paperclip::Interpolations Paperclip::Interpolations
end end
......
...@@ -128,6 +128,8 @@ module Paperclip ...@@ -128,6 +128,8 @@ module Paperclip
# separate parts of your file name. # separate parts of your file name.
module S3 module S3
def self.extended base def self.extended base
warn('[DEPRECATION] S3 support through RightAWS is deprecated. S3 support will ' +
'be changed to AWS::S3 in a future version.')
require 'right_aws' require 'right_aws'
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