github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade FOG

Browse Source
This commit is contained in:
Didier Lafforgue 2012-04-16 12:36:30 +02:00
parent 256a0e4bc0
commit 3eb521ba75
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Gemfile.lock
View File

@ -41,7 +41,7 @@ PATH
devise (~> 1.5.3) devise (~> 1.5.3)
dragonfly (~> 0.9.8) dragonfly (~> 0.9.8)
flash_cookie_session (~> 1.1.1) flash_cookie_session (~> 1.1.1)
fog (~> 1.1.2) fog (~> 1.3.1)
formtastic (~> 2.0.2) formtastic (~> 2.0.2)
haml (~> 3.1.4) haml (~> 3.1.4)
highline (~> 1.6.2) highline (~> 1.6.2)
@ -124,7 +124,7 @@ GEM
childprocess (0.3.1) childprocess (0.3.1)
ffi (~> 1.0.6) ffi (~> 1.0.6)
chunky_png (1.2.5) chunky_png (1.2.5)
codemirror-rails (2.22) codemirror-rails (2.23)
railties (~> 3.0) railties (~> 3.0)
coffee-rails (3.2.2) coffee-rails (3.2.2)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
@ -153,7 +153,7 @@ GEM
rack rack
ejs (1.0.0) ejs (1.0.0)
erubis (2.7.0) erubis (2.7.0)
excon (0.9.6) excon (0.13.4)
execjs (1.3.0) execjs (1.3.0)
multi_json (~> 1.0) multi_json (~> 1.0)
factory_girl (2.5.2) factory_girl (2.5.2)
@ -164,12 +164,12 @@ GEM
ffi (1.0.11) ffi (1.0.11)
flash_cookie_session (1.1.3) flash_cookie_session (1.1.3)
rails (~> 3.0) rails (~> 3.0)
fog (1.1.2) fog (1.3.1)
builder builder
excon (~> 0.9.0) excon (~> 0.13.0)
formatador (~> 0.2.0) formatador (~> 0.2.0)
mime-types mime-types
multi_json (~> 1.0.3) multi_json (~> 1.0)
net-scp (~> 1.0.4) net-scp (~> 1.0.4)
net-ssh (>= 2.1.3) net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0) nokogiri (~> 1.5.0)
@ -221,8 +221,8 @@ GEM
activemodel (~> 3.1) activemodel (~> 3.1)
mongo (~> 1.3) mongo (~> 1.3)
tzinfo (~> 0.3.22) tzinfo (~> 0.3.22)
multi_json (1.0.4) multi_json (1.3.0)
multi_xml (0.4.2) multi_xml (0.4.3)
net-scp (1.0.4) net-scp (1.0.4)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
net-ssh (2.3.0) net-ssh (2.3.0)
@ -296,7 +296,8 @@ GEM
libwebsocket (~> 0.1.3) libwebsocket (~> 0.1.3)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
shoulda-matchers (1.0.0) shoulda-matchers (1.1.0)
activesupport (>= 3.0.0)
sprockets (2.1.2) sprockets (2.1.2)
hike (~> 1.2) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)

2
locomotive_cms.gemspec
View File

@ -54,7 +54,7 @@ Gem::Specification.new do |s|
s.add_dependency 'rmagick', '~> 2.12.2' s.add_dependency 'rmagick', '~> 2.12.2'
s.add_dependency 'carrierwave-mongoid', '~> 0.1.3' s.add_dependency 'carrierwave-mongoid', '~> 0.1.3'
s.add_dependency 'carrierwave', '~> 0.6.0' s.add_dependency 'carrierwave', '~> 0.6.0'
s.add_dependency 'fog', '~> 1.1.2' s.add_dependency 'fog', '~> 1.3.1'
s.add_dependency 'dragonfly', '~> 0.9.8' s.add_dependency 'dragonfly', '~> 0.9.8'
s.add_dependency 'rack-cache', '~> 1.1' s.add_dependency 'rack-cache', '~> 1.1'
s.add_dependency 'mimetype-fu', '~> 0.1.2' s.add_dependency 'mimetype-fu', '~> 0.1.2'