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 /railties/lib | |
| 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 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index ab10523861..cc21213f1c 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -91,7 +91,7 @@ module Rails message = "config.threadsafe! is deprecated. Rails applications " \ "behave by default as thread safe in production as long as config.cache_classes and " \ "config.eager_load are set to true" - ActiveSupport::Deprecation.warn(message, caller) + ActiveSupport::Deprecation.warn message @cache_classes = true @eager_load = true self @@ -142,8 +142,7 @@ module Rails end def whiny_nils=(*) - ActiveSupport::Deprecation.warn "config.whiny_nils option " \ - "is deprecated and no longer works", caller + ActiveSupport::Deprecation.warn "config.whiny_nils option is deprecated and no longer works" end end end |