aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/delegation.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-06-28 16:43:28 -0400
committerGitHub <noreply@github.com>2017-06-28 16:43:28 -0400
commit8c65abe5f804522bcbf0d6f4327e7dfad0603941 (patch)
treed5ccbfd4eb67d82ff4ccd02c4d0b6f067d71fcd6 /activerecord/lib/active_record/relation/delegation.rb
parent97d276bf8a6b9d79dc50fcbc8a45f6071da0fcef (diff)
parent425f2cacafc522bb0aa426a0a4bc92c1237160aa (diff)
downloadrails-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/delegation.rb')
-rw-r--r--activerecord/lib/active_record/relation/delegation.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb
index dada0fddf8..8b4dd25689 100644
--- a/activerecord/lib/active_record/relation/delegation.rb
+++ b/activerecord/lib/active_record/relation/delegation.rb
@@ -44,8 +44,6 @@ module ActiveRecord
delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key,
:connection, :columns_hash, to: :klass
- delegate :ast, :locked, to: :arel
-
module ClassSpecificRelation # :nodoc:
extend ActiveSupport::Concern