Permalink
Browse files

Remove whitespace, fix code styling

  • Loading branch information...
1 parent 878622c commit 0958e6fc9e16b1df7b90a65554070a8ee002d727 @sikachu sikachu committed Jul 4, 2012
Showing with 2 additions and 3 deletions.
  1. +2 −2 lib/paperclip/storage/s3.rb
  2. +0 −1 test/integration_test.rb
@@ -343,6 +343,8 @@ def copy_to_local_file(style, local_dest_path)
false
end
+ private
+
def find_credentials creds
case creds
when File
@@ -355,12 +357,10 @@ def find_credentials creds
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
View
@@ -630,7 +630,6 @@ def s3_headers_for attachment, style
context "with non-english character in the file name" do
setup do
-
@file.stubs(:original_filename).returns("クリップ.png")
@dummy.avatar = @file
end

0 comments on commit 0958e6f

Please sign in to comment.