From a02a8336256b880ab6da9559a01c21058a0c299b Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Sat, 10 Jul 2010 00:32:58 -0700
Subject: [PATCH] updated rails for kicks, run bundle install, and run gem
 install bundler --pre rspec-rails --pre too

---
 .gitignore                         | 1 +
 Gemfile                            | 2 +-
 config/environments/development.rb | 2 +-
 lib/common.rb                      | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b309cc03..91e987e1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,6 @@
 db/*.sqlite3
 log/*.log
 tmp/**/*
+Gemfile.lock
 gpg/diaspora-development/*.gpg
 gpg/diaspora-production/*.gpg
diff --git a/Gemfile b/Gemfile
index 4f2c736a1..7be06ae84 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 source 'http://gemcutter.org'
 
-gem 'rails', '3.0.0.beta4'
+gem 'rails', :git =>'http://github.com/rails/rails.git'
 gem 'bundler'
 gem 'mongo_mapper', :git => "http://github.com/BadMinus/mongomapper.git"
 gem 'devise', :git => "http://github.com/BadMinus/devise.git"
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d03bf7d3a..12446d661 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,6 +16,6 @@ Diaspora::Application.configure do
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
-
+  config.active_support.deprecation = :log
   #config.threadsafe!
 end
diff --git a/lib/common.rb b/lib/common.rb
index a049b561f..13c87ae62 100644
--- a/lib/common.rb
+++ b/lib/common.rb
@@ -47,6 +47,7 @@ module Diaspora
     def self.included(klass)
       klass.class_eval do
         include ROXML
+        require 'message_handler'
         @@queue = MessageHandler.new
 
         def notify_people