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
8fb03315
Commit
8fb03315
authored
May 04, 2012
by
Prem Sichanugrist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure the `aws/sdk` patch got picked up
parent
b48ec849
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
lib/paperclip/storage/s3.rb
+4
-4
No files found.
lib/paperclip/storage/s3.rb
View file @
8fb03315
...
@@ -85,6 +85,10 @@ module Paperclip
...
@@ -85,6 +85,10 @@ module Paperclip
def
self
.
extended
base
def
self
.
extended
base
begin
begin
require
'aws-sdk'
require
'aws-sdk'
rescue
LoadError
=>
e
e
.
message
<<
" (You may need to install the aws-sdk gem)"
raise
e
end
unless
defined?
(
AWS
::
Core
)
# Overriding AWS::Core::LogFormatter to make sure it return a UTF-8 string
# Overriding AWS::Core::LogFormatter to make sure it return a UTF-8 string
if
AWS
::
VERSION
>=
"1.3.9"
if
AWS
::
VERSION
>=
"1.3.9"
...
@@ -100,10 +104,6 @@ module Paperclip
...
@@ -100,10 +104,6 @@ module Paperclip
end
end
end
end
end
end
rescue
LoadError
=>
e
e
.
message
<<
" (You may need to install the aws-sdk gem)"
raise
e
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