diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/framework.rake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 24eda9da03..c942ed6ca4 100644 --- a/railties/CHANGELOG +++ b/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] + * Automatically generate add/remove column commands in specially named migrations like AddLocationToEvent. Closes #9006 [zenspider] * Default to plural table name in Rails Generator if ActiveRecord is not present. Closes #8963 [evan] diff --git a/railties/lib/tasks/framework.rake b/railties/lib/tasks/framework.rake index 6eaff2918e..2687129581 100644 --- a/railties/lib/tasks/framework.rake +++ b/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 |