diff options
| -rw-r--r-- | activesupport/lib/active_support.rb | 2 | ||||
| -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 |