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

0caf4b3d · Holger Just · 5592794d · da45dfcc · 0caf4b3d
Commit 0caf4b3d authored Mar 02, 2011 by Holger Just
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

boot.rb config/boot.rb +3 -0

No files found.
--- 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!