From 975155c11034056dc34b278c55b7ab9d73949c46 Mon Sep 17 00:00:00 2001
From: Charlie Somerville <charlie@charliesomerville.com>
Date: Tue, 21 Jan 2014 12:33:39 +1100
Subject: [PATCH] use i18n 0.6.9 as a gem

---
 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 527f9e15e0..e7eb926e0f 100644
--- a/Gemfile.sh
+++ b/Gemfile.sh
@@ -5,3 +5,4 @@ gem install sqlite3 -v=1.3.7
 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
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
index b4cc7afe10..a250157599 100644
--- a/activesupport/lib/active_support/vendor.rb
+++ b/activesupport/lib/active_support/vendor.rb
@@ -16,11 +16,6 @@
 
 $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12"
 
-begin
-  gem 'i18n', '>= 0.4.1'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.4.1"
-end
 require 'i18n'
 
 module I18n
-- 
GitLab