From d0cc2984b8f34b7d09239a7ed499e332ae45c412 Mon Sep 17 00:00:00 2001
From: Didier Lafforgue <didier@nocoffee.fr>
Date: Fri, 17 Feb 2012 11:31:51 +0100
Subject: [PATCH] upgrade fog (we need a newer version for the heroku-api gem)

---
 Gemfile.lock           | 12 ++++++------
 doc/TODO               |  4 ++--
 locomotive_cms.gemspec |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b1c805aa..921e5a01 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,7 +31,7 @@ PATH
       devise (~> 1.5.3)
       dragonfly (~> 0.9.8)
       flash_cookie_session (~> 1.1.1)
-      fog (~> 1.0.0)
+      fog (~> 1.1.2)
       formtastic (~> 2.0.2)
       haml (~> 3.1.4)
       highline (~> 1.6.2)
@@ -149,7 +149,7 @@ GEM
       rack
     ejs (1.0.0)
     erubis (2.7.0)
-    excon (0.7.12)
+    excon (0.9.5)
     execjs (1.3.0)
       multi_json (~> 1.0)
     factory_girl (2.5.2)
@@ -160,14 +160,14 @@ GEM
     ffi (1.0.11)
     flash_cookie_session (1.1.1)
       rails (~> 3.0)
-    fog (1.0.0)
+    fog (1.1.2)
       builder
-      excon (~> 0.7.3)
+      excon (~> 0.9.0)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0.3)
       net-scp (~> 1.0.4)
-      net-ssh (~> 2.1.4)
+      net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.1)
@@ -219,7 +219,7 @@ GEM
     multi_xml (0.4.1)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.1.4)
+    net-ssh (2.2.2)
     nokogiri (1.5.0)
     orm_adapter (0.0.6)
     pickle (0.4.10)
diff --git a/doc/TODO b/doc/TODO
index bdc3f52b..e20784fa 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -66,14 +66,14 @@ x edit my site
     x custom_fields: use the appropriate icon to drag select options
     x bug ui with contents popup
     - use list_or_group_entries instead of ordered_entries
-- i18n
+x i18n
   x add locales a site responds to
   x locale switcher
   x constraint: one locale at least
   x front
     x pages
     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
   x rack
   x iframe
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index e985ddf0..15c8a6d6 100755
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rmagick',                         '~> 2.12.2'
   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 'rack-cache',                      '~> 1.1'
   s.add_dependency 'mimetype-fu',                     '~> 0.1.2'