Commit 31df612d by Mike Burns

Merge branch 'default_fog_public_to_true' of https://github.com/coop/paperclip

parents 5ac36c46 62a9f64d
......@@ -44,7 +44,7 @@ module Paperclip
@fog_directory = @options[:fog_directory]
@fog_credentials = @options[:fog_credentials]
@fog_host = @options[:fog_host]
@fog_public = @options[:fog_public]
@fog_public = @options[:fog_public] || true
@fog_file = @options[:fog_file] || {}
@url = ':fog_public_url'
......
......@@ -24,7 +24,6 @@ class FogTest < Test::Unit::TestCase
:fog_directory => @fog_directory,
:fog_credentials => @credentials,
:fog_host => nil,
:fog_public => true,
:fog_file => {:cache_control => 1234},
:path => ":attachment/:basename.:extension",
:storage => :fog
......@@ -100,7 +99,6 @@ class FogTest < Test::Unit::TestCase
:fog_directory => @fog_directory,
:fog_credentials => @credentials,
:fog_host => 'http://img%d.example.com',
:fog_public => true,
:path => ":attachment/:basename.:extension",
:storage => :fog
)
......
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