From 407d7e067efeaa86ffea6926056cab0f43c1c0b1 Mon Sep 17 00:00:00 2001
From: Adrian Short <adrian.short@gmail.com>
Date: Mon, 14 Jan 2013 15:06:44 +0000
Subject: [PATCH] Update gems

---
 Gemfile.lock | 82 ++++++++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3b01ee0..80842eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,22 +30,22 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    bson (1.6.4)
-    bson_ext (1.6.4)
-      bson (~> 1.6.4)
-    builder (3.0.0)
+    bson (1.8.1)
+    bson_ext (1.8.1)
+      bson (~> 1.8.1)
+    builder (3.0.4)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.4.0)
     curb (0.7.18)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    faraday (0.8.1)
+    faraday (0.8.4)
       multipart-post (~> 1.1)
     feedzirra (0.0.31)
       activesupport (>= 3.0.8)
@@ -57,52 +57,58 @@ GEM
       rake (>= 0.9.2)
       rdoc (~> 3.8)
       sax-machine (~> 0.0.20)
-    haml (3.1.6)
-    haml-rails (0.3.4)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      haml (~> 3.0)
-      railties (~> 3.0)
+    haml (3.1.7)
+    haml-rails (0.3.5)
+      actionpack (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+      haml (~> 3.1)
+      railties (>= 3.1, < 4.1)
     hike (1.2.1)
     htmlentities (4.3.1)
-    i18n (0.6.0)
+    httpauth (0.2.0)
+    i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.3)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.6)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
     loofah (1.0.0)
       nokogiri (>= 1.3.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
+    mime-types (1.19)
     mm-multi-parameter-attributes (0.2.2)
       mongo_mapper (>= 0.9.0)
       tzinfo
-    mongo (1.6.4)
-      bson (~> 1.6.4)
-    mongo_mapper (0.11.1)
+    mongo (1.8.1)
+      bson (~> 1.8.1)
+    mongo_mapper (0.12.0)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
-      plucky (~> 0.4.0)
-    multi_json (1.3.6)
+      plucky (~> 0.5.2)
+    multi_json (1.5.0)
     multipart-post (1.1.5)
     nokogiri (1.4.7)
-    oauth (0.4.6)
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
+    oauth (0.4.7)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
+      jwt (~> 0.1.4)
       multi_json (~> 1.0)
-    plucky (0.4.4)
+      rack (~> 1.2)
+    plucky (0.5.2)
       mongo (~> 1.5)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.3)
       actionmailer (= 3.2.3)
@@ -119,34 +125,34 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    sass (3.1.19)
+    sass (3.2.5)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
     sax-machine (0.0.20)
       nokogiri (> 0.0.0)
-    sorcery (0.7.12)
+    sorcery (0.8.0)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
+      oauth2 (~> 0.8.0)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    uglifier (1.2.5)
+    tzinfo (0.3.35)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.3)
-    will_paginate (3.0.3)
+      multi_json (~> 1.0, >= 1.0.2)
+    will_paginate (3.0.4)
 
 PLATFORMS
   ruby