diff options
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index abc134b11c..f8ef03aebb 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove deprecation warning for `auto_explain_threshold_in_seconds`. + + *Yves Senn* + * Remove deprecated `:distinct` option from `Relation#count`. *Yves Senn* diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index afb0be7b74..4b455594d4 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -135,17 +135,6 @@ module ActiveRecord EOF end - unless app.config.active_record.delete(:auto_explain_threshold_in_seconds).nil? - ActiveSupport::Deprecation.warn <<-EOF.strip_heredoc, [] - The Active Record auto explain feature has been removed. - - To disable this message remove the `active_record.auto_explain_threshold_in_seconds` - option from the `config/environments/*.rb` config file. - - See http://guides.rubyonrails.org/4_0_release_notes.html for more information. - EOF - end - unless app.config.active_record.delete(:observers).nil? ActiveSupport::Deprecation.warn <<-EOF.strip_heredoc, [] Active Record Observers has been extracted out of Rails into a gem. |