aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/core.rb
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2018-09-10 19:10:44 +0300
committerbogdanvlviv <bogdanvlviv@gmail.com>2018-09-12 18:53:53 +0300
commit59cae0755eea9aa7be4d746427b007f61f33c4ec (patch)
treeeed48bcecd055687714683774b63a17652be3bd8 /activerecord/lib/active_record/core.rb
parentd1a14865e055091fc2a50ddfd7e9e206152b1095 (diff)
downloadrails-59cae0755eea9aa7be4d746427b007f61f33c4ec.tar.gz
rails-59cae0755eea9aa7be4d746427b007f61f33c4ec.tar.bz2
rails-59cae0755eea9aa7be4d746427b007f61f33c4ec.zip
Add mention about `ActiveRecord::Base::filter_attributes` to the changelog entry
Also remove `# :nodoc:` for `ActiveRecord::Core::ClassMethods` in order to show non-nodoc methods in that module on the api docs http://edgeapi.rubyonrails.org
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
-rw-r--r--activerecord/lib/active_record/core.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 0002941ff6..392602bc0f 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -139,7 +139,7 @@ module ActiveRecord
self.default_connection_handler = ConnectionAdapters::ConnectionHandler.new
end
- module ClassMethods # :nodoc:
+ module ClassMethods
def initialize_find_by_cache # :nodoc:
@find_by_statement_cache = { true => Concurrent::Map.new, false => Concurrent::Map.new }
end
@@ -216,7 +216,7 @@ module ActiveRecord
generated_association_methods
end
- def generated_association_methods
+ def generated_association_methods # :nodoc:
@generated_association_methods ||= begin
mod = const_set(:GeneratedAssociationMethods, Module.new)
private_constant :GeneratedAssociationMethods
@@ -226,7 +226,7 @@ module ActiveRecord
end
end
- # Returns columns which shouldn't be exposed while calling #inspect.
+ # Returns columns which shouldn't be exposed while calling +#inspect+.
def filter_attributes
if defined?(@filter_attributes)
@filter_attributes
@@ -235,13 +235,13 @@ module ActiveRecord
end
end
- # Specifies columns which shouldn't be exposed while calling #inspect.
+ # Specifies columns which shouldn't be exposed while calling +#inspect+.
def filter_attributes=(attributes_names)
@filter_attributes = attributes_names.map(&:to_s).to_set
end
# Returns a string like 'Post(id:integer, title:string, body:text)'
- def inspect
+ def inspect # :nodoc:
if self == Base
super
elsif abstract_class?
@@ -257,7 +257,7 @@ module ActiveRecord
end
# Overwrite the default class equality method to provide support for decorated models.
- def ===(object)
+ def ===(object) # :nodoc:
object.is_a?(self)
end