Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
paperclip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ikcrm_common
paperclip
Commits
1df1b030
Commit
1df1b030
authored
Dec 14, 2011
by
Prem Sichanugrist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure that `aws-sdk` is installed by checking for AWS::Core instead
parent
ac822448
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
lib/paperclip/storage/s3.rb
+2
-2
No files found.
lib/paperclip/storage/s3.rb
View file @
1df1b030
...
@@ -79,11 +79,11 @@ module Paperclip
...
@@ -79,11 +79,11 @@ module Paperclip
module
S3
module
S3
def
self
.
extended
base
def
self
.
extended
base
begin
begin
require
'aws
/s3
'
require
'aws
-sdk
'
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
unless
defined?
(
AWS
::
S3
)
end
unless
defined?
(
AWS
::
Core
)
base
.
instance_eval
do
base
.
instance_eval
do
@s3_options
=
@options
[
:s3_options
]
||
{}
@s3_options
=
@options
[
:s3_options
]
||
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment