From 0546bb2582e6fb308959477836bd77bd25278d30 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Tue, 22 Jun 2010 10:39:06 -0700
Subject: [PATCH] pulled in all of max's changes from yesterday to 187

---
 Gemfile            | 4 ++--
 app/models/post.rb | 2 +-
 config.ru          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5a92149ae..70d2ba306 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,9 +11,9 @@ gem 'roxml', :git => "git://github.com/Empact/roxml.git"
 
 
 #mai crazy async stuff
-gem 'em-synchrony',   :git => 'git://github.com/igrigorik/em-synchrony.git',    :require => 'em-synchrony/em-http'
+#gem 'em-synchrony',   :git => 'git://github.com/igrigorik/em-synchrony.git',    :require => 'em-synchrony/em-http'
 gem 'em-http-request',:git => 'git://github.com/igrigorik/em-http-request.git', :require => 'em-http'
-gem 'rack-fiber_pool', :require => 'rack/fiber_pool'
+#gem 'rack-fiber_pool', :require => 'rack/fiber_pool'
 gem 'addressable', :require => "addressable/uri"
 gem 'em-websocket'
 gem 'thin'
diff --git a/app/models/post.rb b/app/models/post.rb
index 39dedfe4c..a03d3736c 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1,5 +1,5 @@
 class Post 
-  require_relative '../../lib/common'
+  require 'lib/common'
   include ApplicationHelper 
   
   # XML accessors must always preceed mongo field tags
diff --git a/config.ru b/config.ru
index 58f9e64a8..10d1ee578 100644
--- a/config.ru
+++ b/config.ru
@@ -1,5 +1,5 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
-use Rack::FiberPool
+#use Rack::FiberPool
 run Diaspora::Application