From 38a7432590500724db9543ce2666cd7c93b52f64 Mon Sep 17 00:00:00 2001
From: Charlie Somerville <charlie@charliesomerville.com>
Date: Tue, 21 Jan 2014 14:22:20 +1100
Subject: [PATCH] add builder 3.2.2 to Gemfile.sh and use that instead of
 vendored copy

---
 Gemfile.sh                                 | 1 +
 activesupport/lib/active_support/vendor.rb | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Gemfile.sh b/Gemfile.sh
index e7eb926e0f..07cfa55f36 100644
--- a/Gemfile.sh
+++ b/Gemfile.sh
@@ -6,3 +6,4 @@ gem install rack    -v=1.4.5
 gem install erubis  -v=2.7.0
 gem install json    -v=1.8.0
 gem install i18n    -v=0.6.9
+gem install builder -v=3.2.2
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
index a250157599..0128847132 100644
--- a/activesupport/lib/active_support/vendor.rb
+++ b/activesupport/lib/active_support/vendor.rb
@@ -1,11 +1,6 @@
 # Prefer gems to the bundled libs.
 require 'rubygems'
 
-begin
-  gem 'builder', '~> 2.1.2'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
-end
 require 'builder'
 
 begin
-- 
GitLab