Merge remote-tracking branch 'schmidt/b/251-make-chili-work-with-rubyges-1.6'

2011-03-02 15:07:30 +01:00 · 2011-03-02 15:07:30 +01:00 · 0caf4b3d5e
commit 0caf4b3d5e
parent 5592794d75 da45dfcc72
1 changed files with 3 additions and 0 deletions
--- a/config/boot.rb
+++ b/config/boot.rb
@ -158,5 +158,8 @@ module Rails
  end
 end

+# working around deprecation in RubyGems 1.6
+require 'thread'
+
 # All that for this:
 Rails.boot!