diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-09-13 12:58:49 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-09-13 12:58:49 -0500 |
| commit | 25f4129151070f8c237ea3092a5da59253a1a2fc (patch) | |
| tree | 69c1e51f7da1076b9aadf35f7052140e4d172da0 /actionpack | |
| parent | 870bf8950f606ef50d1b6418a63dd94cf6fbc99e (diff) | |
| download | rails-25f4129151070f8c237ea3092a5da59253a1a2fc.tar.gz rails-25f4129151070f8c237ea3092a5da59253a1a2fc.tar.bz2 rails-25f4129151070f8c237ea3092a5da59253a1a2fc.zip | |
Need to declare optional dependencies from AS
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/Gemfile | 8 | ||||
| -rw-r--r-- | actionpack/test/abstract_controller/test_helper.rb | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/actionpack/Gemfile b/actionpack/Gemfile index ed1ae2e9c0..8abf63bd35 100644 --- a/actionpack/Gemfile +++ b/actionpack/Gemfile @@ -9,6 +9,12 @@ only :test do gem "mocha" gem "sqlite3-ruby" gem "RedCloth" + + activesupport_vendor = rails_root.join('activesupport', 'lib', 'active_support', 'vendor') + + gem 'builder', '2.1.2', :vendored_at => activesupport_vendor.join('builder-2.1.2') + gem 'memcache-client', '1.6.5', :vendored_at => activesupport_vendor.join('memcache-client-1.6.5') + gem 'tzinfo', '0.3.13', :vendored_at => activesupport_vendor.join('tzinfo-0.3.13') end -disable_system_gems
\ No newline at end of file +disable_system_gems diff --git a/actionpack/test/abstract_controller/test_helper.rb b/actionpack/test/abstract_controller/test_helper.rb index ba4302d914..18e4d3c0e5 100644 --- a/actionpack/test/abstract_controller/test_helper.rb +++ b/actionpack/test/abstract_controller/test_helper.rb @@ -2,6 +2,9 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib') $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') $:.unshift(File.dirname(__FILE__) + '/../lib') +bundler = File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environment') +require bundler if File.exist?("#{bundler}.rb") + require 'rubygems' require 'test/unit' require 'active_support' |