Merge branch 'master' into filter_support

kristianmandrup · Jul 26, 2012 · 6dfaae1 · 6dfaae1
2 parents 769a34c + 3bdb4f3
commit 6dfaae1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,8 @@ rails/all includes elements requiring ActiveRecord::Connection ...
 Execute:
 
     $ bundle
-	$ rails g devise:install
+    $ rails g devise:install
+    $ rails g active_admin:install
 
 Check that the generated initializers/devise.rb file requires mongoid orm.
 You may find a line like this :

diff --git a/lib/active_admin/mongoid.rb b/lib/active_admin/mongoid.rb
@@ -13,7 +13,6 @@ def setup *args, &block
 
       require 'active_admin/mongoid/adaptor'
       require 'active_admin/mongoid/comments'
-      require 'active_admin/mongoid/form_builder'
       require 'active_admin/mongoid/filter_form_builder'
       require 'active_admin/mongoid/resource'
       require 'active_admin/mongoid/document'

diff --git a/lib/active_admin/mongoid/form_builder.rb b/lib/active_admin/mongoid/form_builder.rb