diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-11-25 10:04:08 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-25 10:04:08 -0500 |
commit | 8c750ffb92a8e5ee5661875c52dbc1a7686fb1bc (patch) | |
tree | 1b07927ec0cf2b45dcd662fd82a4284a67c31ed0 /activerecord | |
parent | 0f79ab91150b4cdb6c018530978a3395962c7a02 (diff) | |
parent | 913742af0bbcace4e39c3f516d599bfc0ae5ea82 (diff) | |
download | rails-8c750ffb92a8e5ee5661875c52dbc1a7686fb1bc.tar.gz rails-8c750ffb92a8e5ee5661875c52dbc1a7686fb1bc.tar.bz2 rails-8c750ffb92a8e5ee5661875c52dbc1a7686fb1bc.zip |
Merge pull request #30510 from yhirano55/add_nodoc_to_activerecord
Add :nodoc: to activerecord [ci skip]
Diffstat (limited to 'activerecord')
3 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index ca651ef390..0e552dba95 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -44,7 +44,7 @@ module ActiveRecord json: { name: "json" }, } - class StatementPool < ConnectionAdapters::StatementPool + class StatementPool < ConnectionAdapters::StatementPool # :nodoc: private def dealloc(stmt) stmt[:stmt].close end diff --git a/activerecord/lib/active_record/migration/command_recorder.rb b/activerecord/lib/active_record/migration/command_recorder.rb index ac7d506fd1..81ef4828f8 100644 --- a/activerecord/lib/active_record/migration/command_recorder.rb +++ b/activerecord/lib/active_record/migration/command_recorder.rb @@ -110,7 +110,7 @@ module ActiveRecord private - module StraightReversions + module StraightReversions # :nodoc: private { transaction: :transaction, execute_block: :execute_block, diff --git a/activerecord/lib/active_record/scoping.rb b/activerecord/lib/active_record/scoping.rb index da585a9562..01ac56570a 100644 --- a/activerecord/lib/active_record/scoping.rb +++ b/activerecord/lib/active_record/scoping.rb @@ -11,23 +11,23 @@ module ActiveRecord include Named end - module ClassMethods - def current_scope(skip_inherited_scope = false) # :nodoc: + module ClassMethods # :nodoc: + def current_scope(skip_inherited_scope = false) ScopeRegistry.value_for(:current_scope, self, skip_inherited_scope) end - def current_scope=(scope) #:nodoc: + def current_scope=(scope) ScopeRegistry.set_value_for(:current_scope, self, scope) end # Collects attributes from scopes that should be applied when creating # an AR instance for the particular class this is called on. - def scope_attributes # :nodoc: + def scope_attributes all.scope_for_create end # Are there attributes associated with this scope? - def scope_attributes? # :nodoc: + def scope_attributes? current_scope end end |