aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJeremy Kemper <jeremykemper@gmail.com>2014-03-15 06:26:06 -0700
committerJeremy Kemper <jeremykemper@gmail.com>2014-03-15 06:26:15 -0700
commit7a5601c432d3906cc6ab853b3316e76a162f75d1 (patch)
treed9c1e4cd0567c872ac8eb7ba70b4a4c0d207e86d /activesupport
parent6869884b4606b362d995173fcdac68201bc5601c (diff)
downloadrails-7a5601c432d3906cc6ab853b3316e76a162f75d1.tar.gz
rails-7a5601c432d3906cc6ab853b3316e76a162f75d1.tar.bz2
rails-7a5601c432d3906cc6ab853b3316e76a162f75d1.zip
Remove deprecation on active_support/core_ext/class/attribute_accessors requires. Appropriate to keep this, users don't care that the implementation got unified.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/class/attribute_accessors.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
index 083b165dce..84d5e95e7a 100644
--- a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
+++ b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
@@ -1,6 +1,4 @@
-require 'active_support/deprecation'
+# cattr_* became mattr_* aliases in 7dfbd91b0780fbd6a1dd9bfbc176e10894871d2d,
+# but we keep this around for libraries that directly require it knowing they
+# want cattr_*. No need to deprecate.
require 'active_support/core_ext/module/attribute_accessors'
-
-ActiveSupport::Deprecation.warn(
- "The cattr_* method definitions have been moved into active_support/core_ext/module/attribute_accessors. Please require that instead."
-)