diff --git a/Gemfile b/Gemfile index 5a92149aee9e6332a12ad3342e30fb19128a814a..70d2ba306eda8b334eac2f3799cfe696c21b3bbe 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 39dedfe4c7abe64b9cf9d95e7eff9a80769c29dc..a03d3736c4db1882fb80218ed8c2941faad9e8dd 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 58f9e64a893bb2f14a47b1b23e13e622fc66136f..10d1ee578653f7f7a78c32ad9b9e6b25b7280e78 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