mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Require builder before fast_xs so we don't tickle its over-eager String#to_xs collision check
This commit is contained in:
parent
720ffdc42f
commit
0f07b537ce
1 changed files with 2 additions and 1 deletions
|
@ -6,6 +6,7 @@ begin
|
|||
rescue Gem::LoadError
|
||||
$:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
|
||||
end
|
||||
require 'builder'
|
||||
|
||||
begin
|
||||
gem 'xml-simple', '~> 1.0.11'
|
||||
|
@ -31,4 +32,4 @@ end
|
|||
# rescue Gem::LoadError
|
||||
$:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.0.1"
|
||||
require 'i18n'
|
||||
# end
|
||||
# end
|
||||
|
|
Loading…
Reference in a new issue