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
d591a648
Commit
d591a648
authored
Aug 26, 2011
by
Mike Burns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the formatting.
parent
5ec9a737
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
lib/paperclip/storage/fog.rb
+2
-2
test/fog_test.rb
+0
-1
No files found.
lib/paperclip/storage/fog.rb
View file @
d591a648
...
@@ -120,7 +120,7 @@ module Paperclip
...
@@ -120,7 +120,7 @@ module Paperclip
end
end
end
end
def
parse_credentials
creds
def
parse_credentials
(
creds
)
creds
=
find_credentials
(
creds
).
stringify_keys
creds
=
find_credentials
(
creds
).
stringify_keys
env
=
Object
.
const_defined?
(
:Rails
)
?
Rails
.
env
:
nil
env
=
Object
.
const_defined?
(
:Rails
)
?
Rails
.
env
:
nil
(
creds
[
env
]
||
creds
).
symbolize_keys
(
creds
[
env
]
||
creds
).
symbolize_keys
...
@@ -128,7 +128,7 @@ module Paperclip
...
@@ -128,7 +128,7 @@ module Paperclip
private
private
def
find_credentials
creds
def
find_credentials
(
creds
)
case
creds
case
creds
when
File
when
File
YAML
::
load
(
ERB
.
new
(
File
.
read
(
creds
.
path
)).
result
)
YAML
::
load
(
ERB
.
new
(
File
.
read
(
creds
.
path
)).
result
)
...
...
test/fog_test.rb
View file @
d591a648
...
@@ -38,7 +38,6 @@ class FogTest < Test::Unit::TestCase
...
@@ -38,7 +38,6 @@ class FogTest < Test::Unit::TestCase
end
end
end
end
context
"with default values for path and url"
do
context
"with default values for path and url"
do
setup
do
setup
do
rebuild_model
:styles
=>
{
:medium
=>
"300x300>"
,
:thumb
=>
"100x100>"
},
rebuild_model
:styles
=>
{
:medium
=>
"300x300>"
,
:thumb
=>
"100x100>"
},
...
...
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