aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/log_subscriber.rb
diff options
context:
space:
mode:
authorEugene Kenny <elkenny@gmail.com>2017-12-20 01:09:23 +0000
committerEugene Kenny <elkenny@gmail.com>2017-12-20 01:09:23 +0000
commit69d5a7439376401a6c832504aa73686e93da1bd3 (patch)
tree6c75bdb13cef872da33fd65661ac480e8c0eb12d /activerecord/lib/active_record/log_subscriber.rb
parent08b9d8b3e05ef07a8f16245446cb62ca4f265dbb (diff)
downloadrails-69d5a7439376401a6c832504aa73686e93da1bd3.tar.gz
rails-69d5a7439376401a6c832504aa73686e93da1bd3.tar.bz2
rails-69d5a7439376401a6c832504aa73686e93da1bd3.zip
Remove verbose_query_logs from new_framework_defaults_5_2.rb
The `app:update` rake task will regenerate `development.rb` so that it contains this option; that means we're currently adding it to existing apps in two places, which is unnecessary and confusing. Also: - Remove inaccurate comment about which stack frames are ignored - Clarify that the feature uses `caller_locations`, not `caller` - Remove unused return value in `extract_callstack`
Diffstat (limited to 'activerecord/lib/active_record/log_subscriber.rb')
-rw-r--r--activerecord/lib/active_record/log_subscriber.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
index ba3419be6c..9234029c22 100644
--- a/activerecord/lib/active_record/log_subscriber.rb
+++ b/activerecord/lib/active_record/log_subscriber.rb
@@ -121,8 +121,7 @@ module ActiveRecord
[
offending_line.path,
- offending_line.lineno,
- offending_line.label
+ offending_line.lineno
]
end