aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/vendor/builder.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/vendor/builder.rb')
-rw-r--r--activesupport/lib/active_support/vendor/builder.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/vendor/builder.rb b/activesupport/lib/active_support/vendor/builder.rb
index ad89e6635d..349825f438 100644
--- a/activesupport/lib/active_support/vendor/builder.rb
+++ b/activesupport/lib/active_support/vendor/builder.rb
@@ -1,6 +1,7 @@
begin
- require 'builder'
-rescue LoadError
- $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'builder-2.1.2', 'lib'))
- retry
+ gem 'builder', '~> 2.1.2'
+rescue LoadError, NoMethodError
+ $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/builder-2.1.2/lib")
end
+
+require 'builder'