Skip to content
This repository has been archived by the owner on Jul 13, 2023. It is now read-only.

Commit

Permalink
Remove whitespace, fix code styling
Browse files Browse the repository at this point in the history
  • Loading branch information
sikachu committed Jul 4, 2012
1 parent 878622c commit 0958e6f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/paperclip/storage/s3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,8 @@ def copy_to_local_file(style, local_dest_path)
false
end

private

def find_credentials creds
case creds
when File
Expand All @@ -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
1 change: 0 additions & 1 deletion test/integration_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0958e6f

Please sign in to comment.