Update to rails 3.2.12

1 files changed, 76 insertions, 75 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 89b7c21..f17d73d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,41 +1,41 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
       mail (~> 2.4.4)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     acts_as_indexed (0.7.8)
     arel (3.0.2)
-    awesome_nested_set (2.1.5)
+    awesome_nested_set (2.1.6)
       activerecord (>= 3.0.0)
-    babosa (0.3.8)
+    babosa (0.3.9)
     bcrypt-ruby (3.0.1)
     builder (3.0.4)
-    capistrano (2.14.1)
+    capistrano (2.14.2)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -47,121 +47,122 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
-    devise (2.0.4)
+    coffee-script-source (1.6.1)
+    devise (2.0.5)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       railties (~> 3.1)
       warden (~> 1.1.1)
-    dragonfly (0.9.12)
+    dragonfly (0.9.14)
+      multi_json (~> 1.0)
       rack
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
     friendly_id (4.0.9)
-    globalize3 (0.2.0)
+    globalize3 (0.3.0)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       paper_trail (~> 2)
     highline (1.6.15)
     hike (1.2.1)
-    i18n (0.6.1)
+    i18n (0.6.4)
     journey (1.0.4)
     jquery-rails (2.0.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.7.6)
+    json (1.7.7)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
+    mime-types (1.21)
+    multi_json (1.6.1)
     mysql2 (0.3.11)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.6.3)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.6)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     orm_adapter (0.0.7)
-    paper_trail (2.7.0)
+    paper_trail (2.7.1)
       activerecord (~> 3.0)
       railties (~> 3.0)
     polyglot (0.3.3)
-    rack (1.4.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
       bundler (~> 1.0)
-      railties (= 3.2.11)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
-    refinerycms (2.0.9)
+    refinerycms (2.0.10)
       bundler (~> 1.0)
-      refinerycms-authentication (= 2.0.9)
-      refinerycms-core (= 2.0.9)
-      refinerycms-dashboard (= 2.0.9)
-      refinerycms-images (= 2.0.9)
-      refinerycms-pages (= 2.0.9)
-      refinerycms-resources (= 2.0.9)
-    refinerycms-authentication (2.0.9)
-      devise (~> 2.0.0)
+      refinerycms-authentication (= 2.0.10)
+      refinerycms-core (= 2.0.10)
+      refinerycms-dashboard (= 2.0.10)
+      refinerycms-images (= 2.0.10)
+      refinerycms-pages (= 2.0.10)
+      refinerycms-resources (= 2.0.10)
+    refinerycms-authentication (2.0.10)
+      devise (~> 2.0.5)
       orm_adapter (~> 0.0.7)
-      refinerycms-core (= 2.0.9)
-    refinerycms-core (2.0.9)
+      refinerycms-core (= 2.0.10)
+    refinerycms-core (2.0.10)
       acts_as_indexed (~> 0.7.7)
       awesome_nested_set (~> 2.1.3)
       coffee-rails (~> 3.2.1)
-      friendly_id (~> 4.0.1)
-      globalize3 (~> 0.2.0)
+      friendly_id (~> 4.0.9)
+      globalize3 (~> 0.3.0)
       jquery-rails (~> 2.0.0)
-      rails (>= 3.1.3, < 3.3)
+      rails (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0)
       sass-rails (~> 3.2.3)
-      truncate_html (~> 0.5)
+      truncate_html (~> 0.5.5)
       uglifier (>= 1.0.3)
       will_paginate (~> 3.0.2)
-    refinerycms-dashboard (2.0.9)
-      refinerycms-core (= 2.0.9)
+    refinerycms-dashboard (2.0.10)
+      refinerycms-core (= 2.0.10)
     refinerycms-i18n (2.0.2)
       refinerycms-core (~> 2.0.0)
       routing-filter (>= 0.2.3)
-    refinerycms-images (2.0.9)
+    refinerycms-images (2.0.10)
       dragonfly (~> 0.9.8)
       rack-cache (>= 0.5.3)
-      refinerycms-core (= 2.0.9)
-    refinerycms-pages (2.0.9)
+      refinerycms-core (= 2.0.10)
+    refinerycms-pages (2.0.10)
       awesome_nested_set (~> 2.1.3)
       babosa (!= 0.3.6)
-      refinerycms-core (= 2.0.9)
+      refinerycms-core (= 2.0.10)
       seo_meta (~> 1.3.0)
-    refinerycms-resources (2.0.9)
+    refinerycms-resources (2.0.10)
       dragonfly (~> 0.9.8)
       rack-cache (>= 0.5.3)
-      refinerycms-core (= 2.0.9)
+      refinerycms-core (= 2.0.10)
     routing-filter (0.3.1)
       actionpack
     rvm-capistrano (1.2.7)
       capistrano (>= 2.0.0)
-    sass (3.2.5)
+    sass (3.2.7)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -175,12 +176,12 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
     thor (0.17.0)
-    tilt (1.3.3)
+    tilt (1.3.5)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    truncate_html (0.9.1)
-    tzinfo (0.3.35)
+    truncate_html (0.5.5)
+    tzinfo (0.3.37)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
@@ -196,7 +197,7 @@ DEPENDENCIES
   coffee-rails (~> 3.2.1)
   jquery-rails (~> 2.0.0)
   mysql2
-  rails (= 3.2.11)
+  rails (~> 3.2)
   refinerycms (~> 2.0.0)
   refinerycms-i18n (~> 2.0.0)
   rvm-capistrano