Merge branch 'master' of github.com:RailsApps/rails3-devise-rspec-cucumber

Author: DanielKehoe

Gemfile.lock

@@ -40,7 +40,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.2)
+    childprocess (0.2.3)
       ffi (~> 1.0.6)
     coffee-rails (3.1.1)
       coffee-script (>= 2.2.0)
@@ -49,48 +49,47 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.1.3)
-    cucumber (1.1.2)
+    cucumber (1.1.4)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.2)
+      gherkin (~> 2.7.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.2.0)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.1.1)
+    cucumber-rails (1.2.1)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.3)
       nokogiri (>= 1.5.0)
     database_cleaner (0.7.0)
-    devise (1.5.0)
+    devise (1.5.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    execjs (1.2.9)
+    execjs (1.2.12)
       multi_json (~> 1.0)
-    factory_girl (2.3.0)
+    factory_girl (2.3.2)
       activesupport
     factory_girl_rails (1.4.0)
       factory_girl (~> 2.3.0)
       railties (>= 3.0.0)
     ffi (1.0.11)
-    gherkin (2.6.6)
+    gherkin (2.7.1)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.0)
-    jquery-rails (1.0.18)
+    jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.6.1)
-    json_pure (1.6.1)
+    json (1.6.3)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     nokogiri (1.5.0)
     orm_adapter (0.0.5)
     polyglot (0.3.3)
@@ -119,7 +118,7 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0.rc1)
       rspec-core (= 2.8.0.rc1)
@@ -134,31 +133,31 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (= 2.8.0.rc1)
-    rubyzip (0.9.4)
-    sass (3.1.10)
+    rubyzip (0.9.5)
+    sass (3.1.11)
     sass-rails (3.1.5)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
       sass (~> 3.1.10)
       tilt (~> 1.3.2)
-    selenium-webdriver (2.13.0)
+    selenium-webdriver (2.15.0)
       childprocess (>= 0.2.1)
       ffi (~> 1.0.9)
-      json_pure
+      multi_json (~> 1.0.4)
       rubyzip
     sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.5)
     term-ansicolor (1.0.7)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
-    uglifier (1.1.0)
+    uglifier (1.2.0)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     warden (1.1.0)