Commit 0958e6fc by Prem Sichanugrist

Remove whitespace, fix code styling

parent 878622c9
...@@ -343,6 +343,8 @@ module Paperclip ...@@ -343,6 +343,8 @@ module Paperclip
false false
end end
private
def find_credentials creds def find_credentials creds
case creds case creds
when File when File
...@@ -355,12 +357,10 @@ module Paperclip ...@@ -355,12 +357,10 @@ module Paperclip
raise ArgumentError, "Credentials are not a path, file, proc, or hash." raise ArgumentError, "Credentials are not a path, file, proc, or hash."
end end
end end
private :find_credentials
def use_secure_protocol?(style_name) def use_secure_protocol?(style_name)
s3_protocol(style_name) == "https:" s3_protocol(style_name) == "https:"
end end
private :use_secure_protocol?
end end
end end
end end
...@@ -630,7 +630,6 @@ class IntegrationTest < Test::Unit::TestCase ...@@ -630,7 +630,6 @@ class IntegrationTest < Test::Unit::TestCase
context "with non-english character in the file name" do context "with non-english character in the file name" do
setup do setup do
@file.stubs(:original_filename).returns("クリップ.png") @file.stubs(:original_filename).returns("クリップ.png")
@dummy.avatar = @file @dummy.avatar = @file
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment