diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index df02908386..215a37d3dc 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Deprecation: remove deprecated threaded_connections methods. Use allow_concurrency instead. [Jeremy Kemper] + * Associations macros accept extension blocks alongside modules. #9346 [Josh Peek] diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 3fa65bba8f..dd0ba08de0 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -959,16 +959,6 @@ module ActiveRecord #:nodoc: object.is_a?(self) end - # Deprecated - def threaded_connections #:nodoc: - allow_concurrency - end - - # Deprecated - def threaded_connections=(value) #:nodoc: - self.allow_concurrency = value - end - # Returns the base AR subclass that this class descends from. If A # extends AR::Base, A.base_class will return A. If B descends from A # through some arbitrarily deep hierarchy, B.base_class will return A. |