Rails Lighthouse ticket #2672

move-i18n-and-builder-to-activesupport.diff

From 01664bc434fcffd799e78c8b3c7e9c73dc5d98bd Mon Sep 17 00:00:00 2001
From: David Haslem <[email protected]>
Date: Wed, 20 Oct 2010 12:36:24 -0400
Subject: [PATCH] Move i18n and builder dependency to activesupport. [#2672 state:resolved]

---
 actionpack/actionpack.gemspec       |    2 --
 activemodel/activemodel.gemspec     |    2 --
 activesupport/activesupport.gemspec |    2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 40eafd1..39c06ab 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -23,8 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency('activemodel',      version)
   s.add_dependency('rack-cache',       '~> 0.5.3')
   s.add_dependency('rack-cache-purge', '~> 0.0.1')
-  s.add_dependency('builder',          '~> 2.1.2')
-  s.add_dependency('i18n',             '~> 0.4.1')
   s.add_dependency('rack',             '~> 1.2.1')
   s.add_dependency('rack-test',        '~> 0.5.6')
   s.add_dependency('rack-mount',       '~> 0.6.13')
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec
index c483ecb..8d77852 100644
--- a/activemodel/activemodel.gemspec
+++ b/activemodel/activemodel.gemspec
@@ -20,6 +20,4 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
 
   s.add_dependency('activesupport', version)
-  s.add_dependency('builder',       '~> 2.1.2')
-  s.add_dependency('i18n',          '~> 0.4.1')
 end
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index df7f68f..e9fe8f4 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -18,4 +18,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.has_rdoc = true
+  s.add_dependency('i18n',    '~> 0.4.1')
+  s.add_dependency('builder', '~> 2.1.2')
 end
-- 
1.7.0.3

move-i18n-to-activesupport.diff

From 1fe7d4e32a625e21d87742f15c4adb94eae30eb0 Mon Sep 17 00:00:00 2001
From: David Haslem <[email protected]>
Date: Wed, 20 Oct 2010 12:36:24 -0400
Subject: [PATCH] Move i18n dependency to activesupport. [#2672 state:resolved]

---
 actionpack/actionpack.gemspec       |    1 -
 activemodel/activemodel.gemspec     |    1 -
 activesupport/activesupport.gemspec |    1 +
 3 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 40eafd1..22de026 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
   s.add_dependency('rack-cache',       '~> 0.5.3')
   s.add_dependency('rack-cache-purge', '~> 0.0.1')
   s.add_dependency('builder',          '~> 2.1.2')
-  s.add_dependency('i18n',             '~> 0.4.1')
   s.add_dependency('rack',             '~> 1.2.1')
   s.add_dependency('rack-test',        '~> 0.5.6')
   s.add_dependency('rack-mount',       '~> 0.6.13')
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec
index c483ecb..4540d74 100644
--- a/activemodel/activemodel.gemspec
+++ b/activemodel/activemodel.gemspec
@@ -21,5 +21,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activesupport', version)
   s.add_dependency('builder',       '~> 2.1.2')
-  s.add_dependency('i18n',          '~> 0.4.1')
 end
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index df7f68f..213128a 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.has_rdoc = true
+  s.add_dependency('i18n', '~> 0.4.1')
 end
-- 
1.7.0.3