From 9a389cc70e2b8369dd89b55d8bf6801f34028f0b Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Fri, 9 Nov 2012 16:27:18 -0200 Subject: Revert "Add test case to assets eager load" This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5. --- railties/test/application/paths_test.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'railties') diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb index 176476f129..964cff48cd 100644 --- a/railties/test/application/paths_test.rb +++ b/railties/test/application/paths_test.rb @@ -61,8 +61,6 @@ module ApplicationTests assert eager_load.include?(root("app/controllers")) assert eager_load.include?(root("app/helpers")) assert eager_load.include?(root("app/models")) - assert !eager_load.include?(root("app/views")), "expected to not be in the eager_load_path" - assert !eager_load.include?(root("app/assets")), "expected to not be in the eager_load_path" end test "environments has a glob equal to the current environment" do @@ -77,7 +75,6 @@ module ApplicationTests assert_in_load_path "vendor" assert_not_in_load_path "app", "views" - assert_not_in_load_path "app", "assets" assert_not_in_load_path "config" assert_not_in_load_path "config", "locales" assert_not_in_load_path "config", "environments" -- cgit v1.2.3 From b33cf74a4917c6ac5229ba8d6296d33d0b3437bd Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Mon, 12 Nov 2012 13:19:09 -0200 Subject: Bump to 3.2.9 --- railties/lib/rails/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties') diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 28bc89a62d..a7fe32b920 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -3,7 +3,7 @@ module Rails MAJOR = 3 MINOR = 2 TINY = 9 - PRE = "rc3" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end -- cgit v1.2.3