diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-07-05 16:44:32 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-07-05 16:44:32 +0200 |
| commit | b54ef7ebdeeb0463e3348001d3d16b39a7e09506 (patch) | |
| tree | 96b8ba03b4d3026453528fb85927c05aa19f6635 /activerecord/lib | |
| parent | 5ade0ddfe0cb963e7d41a6b5d50e28ee9df3bc00 (diff) | |
| download | rails-b54ef7ebdeeb0463e3348001d3d16b39a7e09506.tar.gz rails-b54ef7ebdeeb0463e3348001d3d16b39a7e09506.tar.bz2 rails-b54ef7ebdeeb0463e3348001d3d16b39a7e09506.zip | |
Revert "Merge pull request #11299 from arunagw/disable_implicit_join_references_removed"
`disable_implicit_join_references=` was only deprecated on `master`,
not with rails 4.0. We can remove it after 4.1
This reverts commit 3c719ead414ffd29e71efce185698af979052abb, reversing
changes made to d5c3bf9722abd5733a769c8d789de3f74dbfb92d.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index 45239c2f79..c6b7da2e3c 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -69,6 +69,11 @@ module ActiveRecord mattr_accessor :timestamped_migrations, instance_writer: false self.timestamped_migrations = true + def self.disable_implicit_join_references=(value) + ActiveSupport::Deprecation.warn("Implicit join references were removed with Rails 4.1." \ + "Make sure to remove this configuration because it does nothing.") + end + class_attribute :default_connection_handler, instance_writer: false def self.connection_handler |