From 20ea2dab2f99b6b39d8b69fc44ec0e2bc6dc4b6c Mon Sep 17 00:00:00 2001
From: Nathan Broadbent <nathan.f77@gmail.com>
Date: Wed, 2 Nov 2011 23:19:35 +0800
Subject: [PATCH] Reverted mongo, bson and bson_ext to = 1.3.1, due to later gems being yanked because of critical bugs... (see http://groups.google.com/group/mongodb-user/browse_thread/thread/7ddaabe02d43fbab). Also commented out rpm_contrib (new_relic), because it should be somehow optional.

---
 Gemfile      |  7 +++++--
 Gemfile.lock | 23 +++++++----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index fe795a7..8088314 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.10'
 gem 'nokogiri'
 gem 'mongoid', '2.1.2'
+
 gem 'haml'
 gem 'htmlentities', "~> 4.3.0"
 gem 'devise', '~> 1.4.0'
@@ -20,7 +21,9 @@ gem 'actionmailer_inline_css', "~> 1.3.0"
 gem 'kaminari'
 
 platform :ruby do
-  gem 'bson_ext', '~> 1.4.0'
+  gem 'mongo', '= 1.3.1'
+  gem 'bson', '= 1.3.1'
+  gem 'bson_ext', '= 1.3.1'
 end
 
 gem 'ri_cal'
@@ -34,7 +37,7 @@ group :development, :test do
     gem 'ruby-debug', :platform => :mri_18
     gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug'
   end
-  gem 'rpm_contrib', :git => "git://github.com/bensymonds/rpm_contrib.git", :branch => "mongo-1.4.0_update"
+  # gem 'rpm_contrib', :git => "git://github.com/bensymonds/rpm_contrib.git", :branch => "mongo-1.4.0_update"
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index cac2c43..ccb80dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
-  remote: git://github.com/bensymonds/rpm_contrib.git
-  revision: 84ee78da6d0f154468d47c9e1e6597997e157291
-  branch: mongo-1.4.0_update
-  specs:
-    rpm_contrib (2.1.6.beta1)
-      newrelic_rpm (>= 3.1.1)
-      newrelic_rpm (>= 3.1.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -46,8 +37,8 @@ GEM
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.4.0)
-    bson_ext (1.4.0)
+    bson (1.3.1)
+    bson_ext (1.3.1)
     builder (2.1.2)
     columnize (0.3.4)
     crack (0.3.1)
@@ -105,8 +96,8 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mongo (1.4.0)
-      bson (= 1.4.0)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
     mongoid (2.1.2)
       activemodel (~> 3.0)
       mongo (~> 1.3)
@@ -118,7 +109,6 @@ GEM
       railties (>= 3.0.0)
     multi_json (1.0.3)
     multipart-post (1.1.3)
-    newrelic_rpm (3.2.0)
     nokogiri (1.5.0)
     octokit (0.6.4)
       addressable (~> 2.2.6)
@@ -224,7 +214,8 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer
   actionmailer_inline_css (~> 1.3.0)
-  bson_ext (~> 1.4.0)
+  bson (= 1.3.1)
+  bson_ext (= 1.3.1)
   database_cleaner (~> 0.6.0)
   devise (~> 1.4.0)
   email_spec
@@ -236,6 +227,7 @@ DEPENDENCIES
   inherited_resources
   kaminari
   lighthouse-api
+  mongo (= 1.3.1)
   mongoid (= 2.1.2)
   mongoid_rails_migrations
   nokogiri
@@ -244,7 +236,6 @@ DEPENDENCIES
   pivotal-tracker
   rails (= 3.0.10)
   ri_cal
-  rpm_contrib!
   rspec (~> 2.6)
   rspec-rails (~> 2.6)
   ruby-debug
--
libgit2 0.21.2