update em-http-request, removed the mutex because we are thin. also removed some uneeded config for database cleaner in the test setup env

This commit is contained in:
maxwell 2010-06-19 15:48:50 -07:00
parent ea7abccd72
commit 5637fa4e4c
4 changed files with 3 additions and 14 deletions

View file

@ -3,7 +3,7 @@ source 'http://rubygems.org'
gem 'rails', '3.0.0.beta4' gem 'rails', '3.0.0.beta4'
gem 'mongrel' gem 'mongrel'
gem 'thin' gem 'thin'
gem 'em-http-request', :require => "em-http" gem 'em-http-request', :require => "em-http", :git => "git://github.com/igrigorik/em-http-request.git"
gem 'addressable', :require => "addressable/uri" gem 'addressable', :require => "addressable/uri"
gem "mongoid", :git => "git://github.com/durran/mongoid.git" gem "mongoid", :git => "git://github.com/durran/mongoid.git"
gem "bson_ext", "1.0.1" gem "bson_ext", "1.0.1"

View file

@ -16,4 +16,5 @@ Diaspora::Application.configure do
# Don't care if the mailer can't send # Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = false config.action_mailer.raise_delivery_errors = false
config.threadsafe!
end end

View file

@ -43,4 +43,5 @@ Diaspora::Application.configure do
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation can not be found) # the I18n.default_locale when a translation can not be found)
config.i18n.fallbacks = true config.i18n.fallbacks = true
config.threadsafe!
end end

View file

@ -29,18 +29,5 @@ Diaspora::Application.configure do
# This is necessary if your schema can't be completely dumped by the schema dumper, # This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types # like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql # config.active_record.schema_format = :sql
#
#
#
begin
require 'database_cleaner'
DatabaseCleaner.strategy = :truncation
DatabaseCleaner.orm = "mongoid"
rescue LoadError => ignore_if_database_cleaner_not_present
puts "Error on cleaner"
end
end end