diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-10-30 03:47:07 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-10-30 03:47:07 -0700 |
| commit | 0ad6c08ca50d19a9994bf4e9a464e1a44cb612a0 (patch) | |
| tree | faceebca94859de69e12f4d7b48e9958b1631575 /activemodel/lib/active_model | |
| parent | 4e23c0ef341c2cba6a4b21022d4ffbabdaa6e3da (diff) | |
| parent | b955939d55b71905fa3e5036149ee4c84943c599 (diff) | |
| download | rails-0ad6c08ca50d19a9994bf4e9a464e1a44cb612a0.tar.gz rails-0ad6c08ca50d19a9994bf4e9a464e1a44cb612a0.tar.bz2 rails-0ad6c08ca50d19a9994bf4e9a464e1a44cb612a0.zip | |
Merge pull request #6107 from gazay/make_caller_attribute_in_deprecation_optional
Make callstack attribute optional in AS:Deprecation
Diffstat (limited to 'activemodel/lib/active_model')
| -rw-r--r-- | activemodel/lib/active_model/attribute_methods.rb | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/observing.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb index 0f5c7f13a8..86eaad830e 100644 --- a/activemodel/lib/active_model/attribute_methods.rb +++ b/activemodel/lib/active_model/attribute_methods.rb @@ -387,7 +387,7 @@ module ActiveModel "necessary. If the un-prefixed/suffixed version of the method has not been " \ "defined when `define_attribute_methods` is called, it will be defined " \ "automatically." - ActiveSupport::Deprecation.warn(message, caller) + ActiveSupport::Deprecation.warn message end @prefix, @suffix = options.fetch(:prefix, ''), options.fetch(:suffix, '') diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb index 277bf30b6a..5f1c99ce62 100644 --- a/activemodel/lib/active_model/observing.rb +++ b/activemodel/lib/active_model/observing.rb @@ -172,7 +172,7 @@ module ActiveModel # <tt>count_observers</tt> is deprecated. Use #observers_count. def count_observers msg = "count_observers is deprecated in favor of observers_count" - ActiveSupport::Deprecation.warn(msg, caller) + ActiveSupport::Deprecation.warn msg observers_count end |