updating rails

Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.0'
+gem 'rails', '3.1.6'
 
 # Asset template engines
 gem 'compass', :git => "git://github.com/chriseppstein/compass.git", :branch => "rails31"

Gemfile.lock

@@ -76,41 +76,39 @@ GEM
   remote: http://rubygems.org/
   specs:
     aaronh-chronic (0.3.9)
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
-      mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    actionmailer (3.1.6)
+      actionpack (= 3.1.6)
+      mail (~> 2.3.3)
+    actionpack (3.1.6)
+      activemodel (= 3.1.6)
+      activesupport (= 3.1.6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.6)
+      activesupport (= 3.1.6)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
+    activerecord (3.1.6)
+      activemodel (= 3.1.6)
+      activesupport (= 3.1.6)
+      arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
+    activeresource (3.1.6)
+      activemodel (= 3.1.6)
+      activesupport (= 3.1.6)
+    activesupport (3.1.6)
+      multi_json (>= 1.0, < 1.3)
     addressable (2.2.6)
     airbrake (3.0.9)
       activesupport
       builder
-    arel (2.2.1)
-    bcrypt-ruby (3.0.0)
+    arel (2.2.3)
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (3.0.0)
@@ -162,17 +160,18 @@ GEM
     jquery-rails (1.0.12)
       railties (~> 3.0)
       thor (~> 0.14)
+    json (1.7.3)
     json_pure (1.5.3)
     kgio (2.6.0)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     libxml-ruby (2.1.2)
-    mail (2.3.0)
+    mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.16)
+    mime-types (1.18)
     minitest (2.12.1)
     mocha (0.11.1)
       metaclass (~> 0.0.1)
@@ -182,7 +181,7 @@ GEM
       activemodel (~> 3.0)
       activesupport (~> 3.0)
       plucky (~> 0.3.8)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     multi_xml (0.2.2)
     multipart-post (1.1.3)
     mustache (0.99.4)
@@ -201,15 +200,15 @@ GEM
       ruby-hmac
     plucky (0.3.8)
       mongo (~> 1.3)
-    polyglot (0.3.2)
+    polyglot (0.3.3)
     pony (1.3)
       mail (> 2.0)
     pygmentize (0.0.3)
     pyu-ruby-sasl (0.0.3.3)
     quiet_assets (1.0.0)
       rails (~> 3.1)
-    rack (1.3.2)
-    rack-cache (1.0.3)
+    rack (1.3.6)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
@@ -220,17 +219,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
+    rails (3.1.6)
+      actionmailer (= 3.1.6)
+      actionpack (= 3.1.6)
+      activerecord (= 3.1.6)
+      activeresource (= 3.1.6)
+      activesupport (= 3.1.6)
       bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
+      railties (= 3.1.6)
+    railties (3.1.6)
+      actionpack (= 3.1.6)
+      activesupport (= 3.1.6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -240,7 +239,8 @@ GEM
     ratom (0.6.9)
       libxml-ruby (>= 1.1.2)
     rdiscount (1.6.8)
-    rdoc (3.9.4)
+    rdoc (3.12)
+      json (~> 1.4)
     redcarpet (1.17.2)
     redfinger (0.1.0)
       hashie
@@ -271,7 +271,7 @@ GEM
     simplecov (0.4.2)
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
-    sprockets (2.0.0)
+    sprockets (2.0.4)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -287,7 +287,7 @@ GEM
       multi_json (~> 1.0.0)
       multi_xml (~> 0.2.0)
       simple_oauth (~> 0.1.5)
-    tzinfo (0.3.29)
+    tzinfo (0.3.33)
     uglifier (1.0.0)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
@@ -336,7 +336,7 @@ DEPENDENCIES
   pony (~> 1.3)
   pygmentize (~> 0.0.3)
   quiet_assets (~> 1.0.0)
-  rails (= 3.1.0)
+  rails (= 3.1.6)
   rdiscount (~> 1.6.8)
   redfinger (~> 0.1.0)
   rocco!