Skip to content
This repository was archived by the owner on Jul 13, 2023. It is now read-only.

Use Updated Version of aws-sdk in Docs [ci skip] #1838

Merged
jyurek merged 1 commit into from
Apr 24, 2015
Merged

Use Updated Version of aws-sdk in Docs [ci skip] #1838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ You may also choose to store your files using Amazon's S3 service. To do so, inc
the `aws-sdk` gem in your Gemfile:

```ruby
gem 'aws-sdk', '~> 1.5.7'
gem 'aws-sdk', '~> 1.6'
```

And then you can specify using S3 from `has_attached_file`.
Expand Down
2 changes: 1 addition & 1 deletion lib/paperclip/storage/s3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Storage
# distribution. You can find out more about it at http://aws.amazon.com/s3
#
# To use Paperclip with S3, include the +aws-sdk+ gem in your Gemfile:
# gem 'aws-sdk'
# gem 'aws-sdk', '~> 1.6'
# There are a few S3-specific options for has_attached_file:
# * +s3_credentials+: Takes a path, a File, a Hash or a Proc. The path (or File) must point
# to a YAML file containing the +access_key_id+ and +secret_access_key+ that Amazon
Expand Down