aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-03-08 16:54:57 +0000
committerRick Olson <technoweenie@gmail.com>2006-03-08 16:54:57 +0000
commit47ffc04621c4ce5cbf491091d3680e8e34e674b7 (patch)
tree7d707c0945188ccc3d4ccbe46160bf084feeefd3 /activesupport
parent519e7e5e1236dfb75a7d759e0a143bc9e0e47385 (diff)
downloadrails-47ffc04621c4ce5cbf491091d3680e8e34e674b7.tar.gz
rails-47ffc04621c4ce5cbf491091d3680e8e34e674b7.tar.bz2
rails-47ffc04621c4ce5cbf491091d3680e8e34e674b7.zip
move vendor inside lib so that rake freeze_edge works
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3818 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support.rb2
-rw-r--r--activesupport/lib/active_support/vendor/builder.rb (renamed from activesupport/vendor/builder.rb)0
-rw-r--r--activesupport/lib/active_support/vendor/builder/blankslate.rb (renamed from activesupport/vendor/builder/blankslate.rb)0
-rw-r--r--activesupport/lib/active_support/vendor/builder/xmlbase.rb (renamed from activesupport/vendor/builder/xmlbase.rb)0
-rw-r--r--activesupport/lib/active_support/vendor/builder/xmlevents.rb (renamed from activesupport/vendor/builder/xmlevents.rb)0
-rw-r--r--activesupport/lib/active_support/vendor/builder/xmlmarkup.rb (renamed from activesupport/vendor/builder/xmlmarkup.rb)0
6 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index a4c2462bdd..037905bea9 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -22,7 +22,7 @@
#++
$:.unshift(File.dirname(__FILE__))
-$:.unshift(File.dirname(__FILE__) + "/../vendor")
+$:.unshift(File.dirname(__FILE__) + "/active_support/vendor")
require 'builder'
diff --git a/activesupport/vendor/builder.rb b/activesupport/lib/active_support/vendor/builder.rb
index 9719277669..9719277669 100644
--- a/activesupport/vendor/builder.rb
+++ b/activesupport/lib/active_support/vendor/builder.rb
diff --git a/activesupport/vendor/builder/blankslate.rb b/activesupport/lib/active_support/vendor/builder/blankslate.rb
index 1408c872cc..1408c872cc 100644
--- a/activesupport/vendor/builder/blankslate.rb
+++ b/activesupport/lib/active_support/vendor/builder/blankslate.rb
diff --git a/activesupport/vendor/builder/xmlbase.rb b/activesupport/lib/active_support/vendor/builder/xmlbase.rb
index 7202bb2ead..7202bb2ead 100644
--- a/activesupport/vendor/builder/xmlbase.rb
+++ b/activesupport/lib/active_support/vendor/builder/xmlbase.rb
diff --git a/activesupport/vendor/builder/xmlevents.rb b/activesupport/lib/active_support/vendor/builder/xmlevents.rb
index 15dc7b6421..15dc7b6421 100644
--- a/activesupport/vendor/builder/xmlevents.rb
+++ b/activesupport/lib/active_support/vendor/builder/xmlevents.rb
diff --git a/activesupport/vendor/builder/xmlmarkup.rb b/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb
index b7e3b2d009..b7e3b2d009 100644
--- a/activesupport/vendor/builder/xmlmarkup.rb
+++ b/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb