aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/attribute_set
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2016-12-19 19:10:49 +0900
committerAkira Matsuda <ronnie@dio.jp>2016-12-23 23:48:54 +0900
commit21e5fd4a2a1c162ad33708d3e01b1fda165f204d (patch)
tree1bd755cd789faccd608e1e72a092723b56435466 /activerecord/lib/active_record/attribute_set
parentbe984f02db145c0091c265babd331127c3b408d9 (diff)
downloadrails-21e5fd4a2a1c162ad33708d3e01b1fda165f204d.tar.gz
rails-21e5fd4a2a1c162ad33708d3e01b1fda165f204d.tar.bz2
rails-21e5fd4a2a1c162ad33708d3e01b1fda165f204d.zip
Describe what we are protecting
Diffstat (limited to 'activerecord/lib/active_record/attribute_set')
-rw-r--r--activerecord/lib/active_record/attribute_set/builder.rb2
-rw-r--r--activerecord/lib/active_record/attribute_set/yaml_encoder.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/attribute_set/builder.rb b/activerecord/lib/active_record/attribute_set/builder.rb
index 661f996e1a..2f624d32af 100644
--- a/activerecord/lib/active_record/attribute_set/builder.rb
+++ b/activerecord/lib/active_record/attribute_set/builder.rb
@@ -90,6 +90,8 @@ module ActiveRecord
@materialized = true
end
+ # TODO Change this to private once we've dropped Ruby 2.2 support.
+ # Workaround for Ruby 2.2 "private attribute?" warning.
protected
attr_reader :types, :values, :additional_types, :delegate_hash, :default
diff --git a/activerecord/lib/active_record/attribute_set/yaml_encoder.rb b/activerecord/lib/active_record/attribute_set/yaml_encoder.rb
index c86cfc4263..899de14792 100644
--- a/activerecord/lib/active_record/attribute_set/yaml_encoder.rb
+++ b/activerecord/lib/active_record/attribute_set/yaml_encoder.rb
@@ -31,6 +31,8 @@ module ActiveRecord
end
end
+ # TODO Change this to private once we've dropped Ruby 2.2 support.
+ # Workaround for Ruby 2.2 "private attribute?" warning.
protected
attr_reader :default_types