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

upgrade fog (we need a newer version for the heroku-api gem)

This commit is contained in:
Didier Lafforgue 2012-02-17 11:31:51 +01:00
parent ecf6998a68
commit d0cc2984b8
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Gemfile.lock
View File

@ -31,7 +31,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.0.0) fog (~> 1.1.2)
formtastic (~> 2.0.2) formtastic (~> 2.0.2)
haml (~> 3.1.4) haml (~> 3.1.4)
highline (~> 1.6.2) highline (~> 1.6.2)
@ -149,7 +149,7 @@ GEM
rack rack
ejs (1.0.0) ejs (1.0.0)
erubis (2.7.0) erubis (2.7.0)
excon (0.7.12) excon (0.9.5)
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)
@ -160,14 +160,14 @@ GEM
ffi (1.0.11) ffi (1.0.11)
flash_cookie_session (1.1.1) flash_cookie_session (1.1.1)
rails (~> 3.0) rails (~> 3.0)
fog (1.0.0) fog (1.1.2)
builder builder
excon (~> 0.7.3) excon (~> 0.9.0)
formatador (~> 0.2.0) formatador (~> 0.2.0)
mime-types mime-types
multi_json (~> 1.0.3) multi_json (~> 1.0.3)
net-scp (~> 1.0.4) net-scp (~> 1.0.4)
net-ssh (~> 2.1.4) net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0) nokogiri (~> 1.5.0)
ruby-hmac ruby-hmac
formatador (0.2.1) formatador (0.2.1)
@ -219,7 +219,7 @@ GEM
multi_xml (0.4.1) multi_xml (0.4.1)
net-scp (1.0.4) net-scp (1.0.4)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
net-ssh (2.1.4) net-ssh (2.2.2)
nokogiri (1.5.0) nokogiri (1.5.0)
orm_adapter (0.0.6) orm_adapter (0.0.6)
pickle (0.4.10) pickle (0.4.10)

4
doc/TODO
View File

@ -66,14 +66,14 @@ x edit my site
x custom_fields: use the appropriate icon to drag select options x custom_fields: use the appropriate icon to drag select options
x bug ui with contents popup x bug ui with contents popup
- use list_or_group_entries instead of ordered_entries - use list_or_group_entries instead of ordered_entries
- i18n x i18n
x add locales a site responds to x add locales a site responds to
x locale switcher x locale switcher
x constraint: one locale at least x constraint: one locale at least
x front x front
x pages x pages
x inline-editor x inline-editor
- back to default locale (if changed in settings) and when creating new pages / entries x back to default locale (if changed in settings) and when creating new pages / entries
- inline editor - inline editor
x rack x rack
x iframe x iframe

2
locomotive_cms.gemspec
View File

@ -52,7 +52,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 'fog', '~> 1.0.0' s.add_dependency 'fog', '~> 1.1.2'
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'