diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-11 05:58:04 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-11 05:59:59 +0900 |
| commit | f30f20ccec9edbffc2b80b2d7e839a4fa9ac1eac (patch) | |
| tree | b3a4d256e14b1a7d1f3806471be2df3a03265991 /activerecord | |
| parent | 412db710dfa6ed84654068576b1841966d7f89b2 (diff) | |
| download | rails-f30f20ccec9edbffc2b80b2d7e839a4fa9ac1eac.tar.gz rails-f30f20ccec9edbffc2b80b2d7e839a4fa9ac1eac.tar.bz2 rails-f30f20ccec9edbffc2b80b2d7e839a4fa9ac1eac.zip | |
Remove the deprecated `:conditions` option in `INVALID_AUTOMATIC_INVERSE_OPTIONS`
This option was moved into active_record_deprecated_finders in ac4d101.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 9e32b69786..c28e31a3da 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -564,7 +564,7 @@ module ActiveRecord end VALID_AUTOMATIC_INVERSE_MACROS = [:has_many, :has_one, :belongs_to] - INVALID_AUTOMATIC_INVERSE_OPTIONS = [:conditions, :through, :foreign_key] + INVALID_AUTOMATIC_INVERSE_OPTIONS = [:through, :foreign_key] def add_as_source(seed) seed |