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
31df612d
Commit
31df612d
authored
Jul 28, 2011
by
Mike Burns
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'default_fog_public_to_true' of
https://github.com/coop/paperclip
parents
5ac36c46
62a9f64d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
3 deletions
+1
-3
lib/paperclip/storage/fog.rb
+1
-1
test/fog_test.rb
+0
-2
No files found.
lib/paperclip/storage/fog.rb
View file @
31df612d
...
...
@@ -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'
...
...
test/fog_test.rb
View file @
31df612d
...
...
@@ -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
)
...
...
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