pulled in all of max's changes from yesterday to 187
This commit is contained in:
parent
0ef2214526
commit
0546bb2582
3 changed files with 4 additions and 4 deletions
4
Gemfile
4
Gemfile
|
|
@ -11,9 +11,9 @@ gem 'roxml', :git => "git://github.com/Empact/roxml.git"
|
||||||
|
|
||||||
|
|
||||||
#mai crazy async stuff
|
#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 '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 'addressable', :require => "addressable/uri"
|
||||||
gem 'em-websocket'
|
gem 'em-websocket'
|
||||||
gem 'thin'
|
gem 'thin'
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
class Post
|
class Post
|
||||||
require_relative '../../lib/common'
|
require 'lib/common'
|
||||||
include ApplicationHelper
|
include ApplicationHelper
|
||||||
|
|
||||||
# XML accessors must always preceed mongo field tags
|
# XML accessors must always preceed mongo field tags
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# This file is used by Rack-based servers to start the application.
|
# This file is used by Rack-based servers to start the application.
|
||||||
|
|
||||||
require ::File.expand_path('../config/environment', __FILE__)
|
require ::File.expand_path('../config/environment', __FILE__)
|
||||||
use Rack::FiberPool
|
#use Rack::FiberPool
|
||||||
run Diaspora::Application
|
run Diaspora::Application
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue