Skip to content
Browse files

Merge gem freezing fix to stable.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7277 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent e3670a0 commit 6cc01c9579348cb40deda44c5ab2f31928a229a4 @NZKoz NZKoz committed
Showing with 4 additions and 2 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +2 −2 railties/lib/tasks/framework.rake
View
2 railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* use Gem.find_name instead of search when freezing gems. Prevent false positives for other gems with rails in the name. Closes #8729 [wselman]
+
* Fix syntax error in dispatcher than wrecked failsafe responses. #8625 [mtitorenko]
* Add Active Resource to rails:freeze:edge and drop Action Web Service. #8205 [underbluewaters, Jeremy Kemper]
View
4 railties/lib/tasks/framework.rake
@@ -7,8 +7,8 @@ namespace :rails do
Gem.manage_gems
rails = (version = ENV['VERSION']) ?
- Gem.cache.search('rails', "= #{version}").first :
- Gem.cache.search('rails').sort_by { |g| g.version }.last
+ Gem.cache.find_name('rails', "= #{version}").first :
+ Gem.cache.find_name('rails').sort_by { |g| g.version }.last
version ||= rails.version

0 comments on commit 6cc01c9

Please sign in to comment.
Something went wrong with that request. Please try again.