aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAlexey Gaziev <alex.gaziev@gmail.com>2012-10-30 10:23:41 +0800
committerAlexey Gaziev <alex.gaziev@gmail.com>2012-10-30 10:23:41 +0800
commitb955939d55b71905fa3e5036149ee4c84943c599 (patch)
treefaceebca94859de69e12f4d7b48e9958b1631575 /railties
parent4e23c0ef341c2cba6a4b21022d4ffbabdaa6e3da (diff)
downloadrails-b955939d55b71905fa3e5036149ee4c84943c599.tar.gz
rails-b955939d55b71905fa3e5036149ee4c84943c599.tar.bz2
rails-b955939d55b71905fa3e5036149ee4c84943c599.zip
Make caller attribute in deprecation methods optional
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/application/configuration.rb5
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