Commit 0546bb25 authored by maxwell's avatar maxwell
Browse files

pulled in all of max's changes from yesterday to 187

parent 0ef22145
......@@ -11,9 +11,9 @@ gem 'roxml', :git => "git://"
#mai crazy async stuff
gem 'em-synchrony', :git => 'git://', :require => 'em-synchrony/em-http'
#gem 'em-synchrony', :git => 'git://', :require => 'em-synchrony/em-http'
gem 'em-http-request',:git => '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'
class Post
require_relative '../../lib/common'
require 'lib/common'
include ApplicationHelper
# XML accessors must always preceed mongo field tags
# 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment