Commit b4a5174d by jyurek

Quick change for permissions syntax.

git-svn-id: https://svn.thoughtbot.com/plugins/paperclip/trunk@443 7bbfaf0e-4d1d-0410-9690-a8bb5f8ef2aa
parent 34755c67
...@@ -40,8 +40,8 @@ module Paperclip ...@@ -40,8 +40,8 @@ module Paperclip
base.instance_eval do base.instance_eval do
@bucket = @options[:bucket] @bucket = @options[:bucket]
@s3_credentials = parse_credentials(@options[:s3_credentials]) @s3_credentials = parse_credentials(@options[:s3_credentials])
@s3_options = {:creds => "public-read"}.merge(@options[:s3_options] || {}) @s3_options = @options[:s3_options] || {}
@s3_permissions = @s3_options.delete(:creds) @s3_permissions = @options[:s3_permissions] || 'public-read'
@s3 = RightAws::S3.new(@s3_credentials['access_key_id'], @s3 = RightAws::S3.new(@s3_credentials['access_key_id'],
@s3_credentials['secret_access_key'], @s3_credentials['secret_access_key'],
......
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