mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Partly revert 1e526788e6
Some attr_readers should be `protected` instead of `private` See https://travis-ci.org/rails/rails/builds/342800276
This commit is contained in:
parent
2bfef0d21f
commit
56278a7a1e
2 changed files with 7 additions and 2 deletions
|
@ -279,9 +279,12 @@ module Mime
|
||||||
|
|
||||||
def all?; false; end
|
def all?; false; end
|
||||||
|
|
||||||
private
|
protected
|
||||||
|
|
||||||
attr_reader :string, :synonyms
|
attr_reader :string, :synonyms
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
def to_ary; end
|
def to_ary; end
|
||||||
def to_a; end
|
def to_a; end
|
||||||
|
|
||||||
|
|
|
@ -53,6 +53,9 @@ module ActiveRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
|
attr_reader :name, :block, :adapter, :override
|
||||||
|
|
||||||
def priority
|
def priority
|
||||||
result = 0
|
result = 0
|
||||||
if adapter
|
if adapter
|
||||||
|
@ -69,7 +72,6 @@ module ActiveRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
attr_reader :name, :block, :adapter, :override
|
|
||||||
|
|
||||||
def matches_adapter?(adapter: nil, **)
|
def matches_adapter?(adapter: nil, **)
|
||||||
(self.adapter.nil? || adapter == self.adapter)
|
(self.adapter.nil? || adapter == self.adapter)
|
||||||
|
|
Loading…
Reference in a new issue