From 732f8f76f3c9767526097cade625491e355f1845 Mon Sep 17 00:00:00 2001 From: did Date: Sun, 30 Oct 2011 14:58:13 +0100 Subject: [PATCH] revert to bson_ext (1.3.1) because the last versions (1.4.x) have been yanked recently (temporary solution) --- Gemfile | 4 +++- Gemfile.lock | 12 +++++++----- locomotive_cms.gemspec | 6 +++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 5f45c6dc..49049540 100644 --- a/Gemfile +++ b/Gemfile @@ -10,8 +10,10 @@ gem 'warden' gem 'devise', '1.3.4' gem 'devise_bushido_authenticatable', '1.0.0.alpha10', :require => 'devise_cas_authenticatable' +gem 'mongo', '~> 1.3.1' +gem 'bson', '~> 1.3.1' +gem 'bson_ext', '~> 1.3.1' gem 'mongoid', '~> 2.0.2' -gem 'bson_ext', '~> 1.4.0' gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree' gem 'will_paginate', '~> 3.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9b2033f1..5a90dfd7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,8 +42,8 @@ GEM autotest (4.4.6) ZenTest (>= 4.4.1) bcrypt-ruby (2.1.4) - bson (1.4.0) - bson_ext (1.4.0) + bson (1.3.1) + bson_ext (1.3.1) builder (2.1.2) bushido (0.0.35) highline (>= 1.6.1) @@ -168,8 +168,8 @@ GEM mimemagic (0.1.8) mimetype-fu (0.1.2) mocha (0.9.12) - mongo (1.4.0) - bson (= 1.4.0) + mongo (1.3.1) + bson (>= 1.3.1) mongoid (2.0.2) activemodel (~> 3.0) mongo (~> 1.3) @@ -285,7 +285,8 @@ DEPENDENCIES ZenTest actionmailer-with-request autotest - bson_ext (~> 1.4.0) + bson (~> 1.3.1) + bson_ext (~> 1.3.1) bushido (= 0.0.35) bushido_stub (= 0.0.3) cancan @@ -316,6 +317,7 @@ DEPENDENCIES locomotive_mongoid_acts_as_tree (= 0.1.5.7) mimetype-fu mocha (= 0.9.12) + mongo (~> 1.3.1) mongoid (~> 2.0.2) pickle rack-cache diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec index f1047bd7..4bf0f342 100644 --- a/locomotive_cms.gemspec +++ b/locomotive_cms.gemspec @@ -21,8 +21,12 @@ Gem::Specification.new do |s| s.add_dependency 'warden' s.add_dependency 'devise', '1.3.4' s.add_dependency 'devise_bushido_authenticatable', '1.0.0.alpha10' + + s.add_dependency 'mongo', '~> 1.3.1' + s.add_dependency 'bson', '~> 1.3.1' + s.add_dependency 'bson_ext', '~> 1.3.1' s.add_dependency 'mongoid', '~> 2.0.2' - s.add_dependency 'bson_ext', '~> 1.4.0' + s.add_dependency 'locomotive_mongoid_acts_as_tree', '0.1.5.7' s.add_dependency 'will_paginate', '~> 3.0.0'