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
7af82d25
Commit
7af82d25
authored
Aug 25, 2008
by
Jon Yurek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Typo fix in s3_url checking by mkdynamic
parent
3b8ed8df
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
lib/paperclip/storage.rb
+1
-1
No files found.
lib/paperclip/storage.rb
View file @
7af82d25
...
@@ -110,7 +110,7 @@ module Paperclip
...
@@ -110,7 +110,7 @@ module Paperclip
@s3_options
=
@options
[
:s3_options
]
||
{}
@s3_options
=
@options
[
:s3_options
]
||
{}
@s3_permissions
=
@options
[
:s3_permissions
]
||
'public-read'
@s3_permissions
=
@options
[
:s3_permissions
]
||
'public-read'
@s3_protocol
=
@options
[
:s3_protocol
]
||
(
@s3_permissions
==
'public-read'
?
'http'
:
'https'
)
@s3_protocol
=
@options
[
:s3_protocol
]
||
(
@s3_permissions
==
'public-read'
?
'http'
:
'https'
)
@url
=
":s3_path_url"
unless
@url
.
to_s
.
match
(
/^s3.*url$/
)
@url
=
":s3_path_url"
unless
@url
.
to_s
.
match
(
/^
:
s3.*url$/
)
end
end
base
.
class
.
interpolations
[
:s3_path_url
]
=
lambda
do
|
attachment
,
style
|
base
.
class
.
interpolations
[
:s3_path_url
]
=
lambda
do
|
attachment
,
style
|
"
#{
attachment
.
s3_protocol
}
://s3.amazonaws.com/
#{
attachment
.
bucket_name
}
/
#{
attachment
.
path
(
style
).
gsub
(
%r{^/}
,
""
)
}
"
"
#{
attachment
.
s3_protocol
}
://s3.amazonaws.com/
#{
attachment
.
bucket_name
}
/
#{
attachment
.
path
(
style
).
gsub
(
%r{^/}
,
""
)
}
"
...
...
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