diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-06-27 13:31:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 13:31:13 -0400 |
| commit | faa225fd029180cb06287be36fad6c742e8e8261 (patch) | |
| tree | c2eebfd59c001bf46094a56fd7e6c19fc1baa344 /activerecord/lib/active_record/scoping/named.rb | |
| parent | d9cda9aa3574379d1c53d5b9116c88c7a1d8a0d6 (diff) | |
| parent | 442c15f1419ae60e4345866e5af59376a679e9d1 (diff) | |
| download | rails-faa225fd029180cb06287be36fad6c742e8e8261.tar.gz rails-faa225fd029180cb06287be36fad6c742e8e8261.tar.bz2 rails-faa225fd029180cb06287be36fad6c742e8e8261.zip | |
Merge pull request #29589 from kamipo/refactor_join_scope
Refactor join dependency to move building constraints to `join_scope` in `Reflection`
Diffstat (limited to 'activerecord/lib/active_record/scoping/named.rb')
| -rw-r--r-- | activerecord/lib/active_record/scoping/named.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb index a61fdd6454..388f471bf5 100644 --- a/activerecord/lib/active_record/scoping/named.rb +++ b/activerecord/lib/active_record/scoping/named.rb @@ -29,8 +29,7 @@ module ActiveRecord end end - def default_scoped # :nodoc: - scope = relation + def default_scoped(scope = relation) # :nodoc: build_default_scope(scope) || scope end |