From c9fe7900c3c1d6d8b1bfceaaaa8b4fe365afd186 Mon Sep 17 00:00:00 2001 From: hpoydar Date: Fri, 16 Apr 2010 17:09:08 -0400 Subject: [PATCH] Removed references to mongo_ext, since mongoid now uses bson_ext MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- .gitignore | 1 + Gemfile | 4 +--- lib/generators/devise_install/templates/devise.rb | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f7bf99c4..ba635564 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ coverage/* rdoc/* pkg log +.bundle diff --git a/Gemfile b/Gemfile index d3192457..1243e8c8 100644 --- a/Gemfile +++ b/Gemfile @@ -13,8 +13,6 @@ if RUBY_VERSION < '1.9' end group :mongoid do - gem "mongo", ">= 0.18.3" - gem "mongo_ext", ">= 0.18.3", :require => false gem "mongoid", :git => "git://github.com/durran/mongoid.git" end @@ -24,4 +22,4 @@ group :data_mapper do gem "dm-validations", :git => "git://github.com/datamapper/dm-more.git" gem "dm-timestamps", :git => "git://github.com/datamapper/dm-more.git" gem "dm-rails", :git => "git://github.com/datamapper/dm-rails.git" -end \ No newline at end of file +end diff --git a/lib/generators/devise_install/templates/devise.rb b/lib/generators/devise_install/templates/devise.rb index 8c1e682b..6e07dd6c 100644 --- a/lib/generators/devise_install/templates/devise.rb +++ b/lib/generators/devise_install/templates/devise.rb @@ -83,7 +83,7 @@ Devise.setup do |config| # ==> General configuration # Load and configure the ORM. Supports :active_record (default), :mongoid - # (requires mongo_ext installed) and :data_mapper (experimental). + # (bson_ext recommended) and :data_mapper (experimental). require 'devise/orm/active_record' # Turn scoped views on. Before rendering "sessions/new", it will first check for