From 6e2c42f8dee553fa3a8988c8ca20d1653744d920 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Wed, 18 Aug 2010 17:42:04 -0700
Subject: [PATCH] MS app now works with rc1

---
 Gemfile                     | 13 +++++++------
 config/application.rb       |  4 ++--
 config/environments/test.rb |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index e1d57cd1e..97f7c4b75 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,16 +1,17 @@
 source 'http://rubygems.org'
 
-#gem 'rails', '3.0.0.rc'
-#gem 'bundler', '1.0.0.rc.1'
-gem 'rails', '3.0.0.beta4'
-gem 'bundler', '0.9.26'
+gem 'rails', '3.0.0.rc'
+gem 'bundler', '1.0.0.rc.5'
+#gem 'rails', '3.0.0.beta4'
+#gem 'bundler', '0.9.26'
 
 #Security
 gem 'gpgme'
 gem 'devise', :git => 'http://github.com/BadMinus/devise.git'
 
 #Mongo
-gem 'mongo_mapper', :git => 'http://github.com/BadMinus/mongomapper.git'
+#gem 'mongo_mapper', :git => 'http://github.com/BadMinus/mongomapper.git'
+gem 'mongo_mapper', :git => 'http://github.com/jnunemaker/mongomapper.git'
 gem 'jnunemaker-validatable', :git => 'http://github.com/BadMinus/validatable.git'
 gem 'mongo_ext'
 gem 'bson_ext'
@@ -28,7 +29,7 @@ gem 'pubsubhubbub'
 gem 'redfinger'
 
 #EventMachine
-gem 'em-http-request',:git => 'git://github.com/igrigorik/em-http-request.git', :ref => 'c6c494c514291f686cf6', :require => 'em-http'
+gem 'em-http-request',:git => 'git://github.com/igrigorik/em-http-request.git', :require => 'em-http'
 gem 'em-websocket'
 gem 'thin'
 
diff --git a/config/application.rb b/config/application.rb
index 5d5b90b54..206139b5e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -15,8 +15,8 @@ module Diaspora
     # -- all .rb files in that directory are automatically loaded.
 
     # Add additional load paths for your own custom dirs
-    # config.load_paths += %W( #{config.root}/extras )
-
+     config.autoload_paths += %W(#{config.root}/lib)
+     
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 7f40c884b..7615ffb1e 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -24,6 +24,7 @@ Diaspora::Application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
+  config.active_support.deprecation = :stderr
   config.threadsafe!