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
d019bcab
Commit
d019bcab
authored
Aug 24, 2015
by
Isaac Betesh
Committed by
Jon Yurek
Sep 01, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved an unless to a separate line to make the following commits more readable
parent
b3f43f03
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletions
+3
-1
lib/paperclip/storage/s3.rb
+3
-1
No files found.
lib/paperclip/storage/s3.rb
View file @
d019bcab
...
@@ -113,6 +113,7 @@ module Paperclip
...
@@ -113,6 +113,7 @@ module Paperclip
module
S3
module
S3
def
self
.
extended
base
def
self
.
extended
base
unless
defined?
(
AWS_CLASS
)
begin
begin
require
'aws-sdk'
require
'aws-sdk'
const_set
(
'AWS_CLASS'
,
defined?
(
::
Aws
)
?
::
Aws
:
::
AWS
)
const_set
(
'AWS_CLASS'
,
defined?
(
::
Aws
)
?
::
Aws
:
::
AWS
)
...
@@ -124,7 +125,8 @@ module Paperclip
...
@@ -124,7 +125,8 @@ module Paperclip
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_CLASS
)
end
end
# Overriding log formatter to make sure it return a UTF-8 string
# Overriding log formatter to make sure it return a UTF-8 string
if
defined?
(
AWS_CLASS
::
Core
::
LogFormatter
)
if
defined?
(
AWS_CLASS
::
Core
::
LogFormatter
)
...
...
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