Merge remote-tracking branch 'upstream/master'

avdi · Dec 14, 2011 · ef5983a · ef5983a
2 parents 066bd0f + fa3487a
commit ef5983a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/nulldb/rails.rb b/lib/nulldb/rails.rb
@@ -1,3 +1,4 @@
 require 'nulldb/core'
 
-NullDB.configure {|ndb| ndb.project_root = Rails.root}
+# Need to defer calling Rails.root because when bundler loads, Rails.root is nil
+NullDB.configure {|ndb| def ndb.project_root;Rails.root;end}