Updating some dependancies.

steveklabnik · steveklabnik · commit 354f2424469d · 2010-09-21T19:57:40.000-04:00
Bson::ObjectID was deprecated, and updating fixes that.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,8 +6,8 @@ GEM
     autotest-fsevent (0.2.3)
       sys-uname
     autotest-growl (0.2.5)
-    bson (1.0.7)
-    bson_ext (1.0.7)
+    bson (1.0.9)
+    bson_ext (1.0.9)
     builder (2.1.2)
     capybara (0.3.9)
       culerity (>= 0.2.4)
@@ -17,56 +17,42 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.3)
     configuration (1.1.0)
-    cucumber (0.8.5)
+    cucumber (0.9.0)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.1.4)
-      json_pure (~> 1.4.3)
-      term-ansicolor (~> 1.0.4)
+      gherkin (~> 2.2.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
     cucumber-sinatra (0.2.3)
       templater (>= 1.0.0)
     culerity (0.2.12)
     database_cleaner (0.5.2)
     diff-lcs (1.1.2)
     extlib (0.9.15)
     factory_girl (1.3.2)
-    factory_girl (1.3.1)
-    factory_girl (1.3.2)
     ffi (0.6.3)
       rake (>= 0.8.7)
-    gherkin (2.1.5)
+    gherkin (2.2.3)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
       trollop (~> 1.16.2)
     haml (3.0.18)
-    haml (3.0.18)
     highline (1.6.1)
     i18n (0.4.1)
     jnunemaker-validatable (1.8.4)
       activesupport (>= 2.3.4)
+    json (1.4.6)
     json_pure (1.4.6)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
     mime-types (1.16)
-    mongo (1.0.8)
+    mongo (1.0.9)
       bson (>= 1.0.5)
-<<<<<<< HEAD
-    mongo_mapper (0.8.4)
-      activesupport (>= 2.3.4)
-      jnunemaker-validatable (~> 1.8.4)
-      plucky (~> 0.3.5)
-=======
-<<<<<<< HEAD
-    mongo_mapper (0.8.2)
-      activesupport (>= 2.3.4)
-      jnunemaker-validatable (~> 1.8.4)
-      plucky (~> 0.3.1)
-=======
     mongo_mapper (0.8.4)
       activesupport (>= 2.3.4)
       jnunemaker-validatable (~> 1.8.4)
       plucky (~> 0.3.5)
->>>>>>> updating gems and the Gemfile.lock
->>>>>>> updating gems and the Gemfile.lock
     nokogiri (1.4.3.1)
     plucky (0.3.5)
       mongo (~> 1.0.8)
