diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-06-28 16:43:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-28 16:43:28 -0400 |
| commit | 8c65abe5f804522bcbf0d6f4327e7dfad0603941 (patch) | |
| tree | d5ccbfd4eb67d82ff4ccd02c4d0b6f067d71fcd6 /activerecord/lib/active_record/relation.rb | |
| parent | 97d276bf8a6b9d79dc50fcbc8a45f6071da0fcef (diff) | |
| parent | 425f2cacafc522bb0aa426a0a4bc92c1237160aa (diff) | |
| download | rails-8c65abe5f804522bcbf0d6f4327e7dfad0603941.tar.gz rails-8c65abe5f804522bcbf0d6f4327e7dfad0603941.tar.bz2 rails-8c65abe5f804522bcbf0d6f4327e7dfad0603941.zip | |
Merge pull request #29405 from kamipo/locked_should_not_build_arel
`Relation#locked?` should not build arel
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 7a8f9abb36..133c1a6318 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -18,7 +18,7 @@ module ActiveRecord attr_reader :table, :klass, :loaded, :predicate_builder alias :model :klass alias :loaded? :loaded - alias :locked? :locked + alias :locked? :lock_value def initialize(klass, table, predicate_builder, values = {}) @klass = klass |