From 1baae1d18557cc8f33539d2aa714bc79aa040150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 9 Nov 2012 09:39:06 -0800 Subject: Merge pull request #8161 from guilleiguaran/downgrade-sprockets Lock sprockets to 2.2.x REASON: We had some pending fixes in sprockets and sass-rails to make possible to use sprockets version > 2.2. We will do a more conservative sprockets upgrade for this release. In a next release we can relax the dependency again. See #8099 for more information. --- actionpack/actionpack.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack') diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 002351696d..ebd3c926eb 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.add_dependency('rack', '~> 1.4.0') s.add_dependency('rack-test', '~> 0.6.1') s.add_dependency('journey', '~> 1.0.4') - s.add_dependency('sprockets', '~> 2.2') + s.add_dependency('sprockets', '~> 2.2.1') s.add_dependency('erubis', '~> 2.7.0') s.add_development_dependency('tzinfo', '~> 0.3.29') -- cgit v1.2.3 From db1d5f40714a47c58c13ff7d9643e8a0dec6bef8 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Fri, 9 Nov 2012 15:51:03 -0200 Subject: Bump up to 3.2.9.rc3 --- actionpack/lib/action_pack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index 27990b83ea..9e8e4b2c66 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -3,7 +3,7 @@ module ActionPack MAJOR = 3 MINOR = 2 TINY = 9 - PRE = "rc2" + PRE = "rc3" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end -- cgit v1.2.3