diff options
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activesupport/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/grouping.rb | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index cd8e50b33a..348873d759 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -147,10 +147,6 @@ *Aaron Christy* -* Add ActiveSupport::Cache::NullStore for use in development and testing. - - *Brian Durand* - ## Rails 3.1.3 (unreleased) ## * Perf fix: If we're deleting all records in an association, don't add a IN(..) clause diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 8299a3fc45..f23ee6e045 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -5,6 +5,8 @@ ## Rails 3.2.0 (unreleased) ## +* Add ActiveSupport::Cache::NullStore for use in development and testing. *Brian Durand* + * Added Enumerable#pluck to wrap the common pattern of collect(&:method) *DHH* * Module#synchronize is deprecated with no replacement. Please use `monitor` diff --git a/activesupport/lib/active_support/core_ext/array/grouping.rb b/activesupport/lib/active_support/core_ext/array/grouping.rb index 4cd9bfadac..2b3f639cb1 100644 --- a/activesupport/lib/active_support/core_ext/array/grouping.rb +++ b/activesupport/lib/active_support/core_ext/array/grouping.rb @@ -1,5 +1,3 @@ -require 'enumerator' - class Array # Splits or iterates over the array in groups of size +number+, # padding any remaining slots with +fill_with+ unless it is +false+. |