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
0958e6fc
Commit
0958e6fc
authored
Jul 03, 2012
by
Prem Sichanugrist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove whitespace, fix code styling
parent
878622c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
lib/paperclip/storage/s3.rb
+2
-2
test/integration_test.rb
+0
-1
No files found.
lib/paperclip/storage/s3.rb
View file @
0958e6fc
...
...
@@ -343,6 +343,8 @@ module Paperclip
false
end
private
def
find_credentials
creds
case
creds
when
File
...
...
@@ -355,12 +357,10 @@ module Paperclip
raise
ArgumentError
,
"Credentials are not a path, file, proc, or hash."
end
end
private
:find_credentials
def
use_secure_protocol?
(
style_name
)
s3_protocol
(
style_name
)
==
"https:"
end
private
:use_secure_protocol?
end
end
end
test/integration_test.rb
View file @
0958e6fc
...
...
@@ -630,7 +630,6 @@ class IntegrationTest < Test::Unit::TestCase
context
"with non-english character in the file name"
do
setup
do
@file
.
stubs
(
:original_filename
).
returns
(
"クリップ.png"
)
@dummy
.
avatar
=
@file
end
...
...
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