Skip to content

Fix Rails 6.1 compatibility #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2020
Merged

Fix Rails 6.1 compatibility #335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/active_resource/validations.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def from_array(messages, save_cache = false)
add humanized_attributes[attr_name], message[(attr_name.size + 1)..-1]
end
end
self[:base] << message if attr_message.nil?
add(:base, message) if attr_message.nil?
end
end

Expand All @@ -40,11 +40,11 @@ def from_hash(messages, save_cache = false)
if @base.known_attributes.include?(key)
add key, error
elsif key == "base"
self[:base] << error
add(:base, error)
else
# reporting an error on an attribute not in attributes
# format and add them to base
self[:base] << "#{key.humanize} #{error}"
add(:base, "#{key.humanize} #{error}")
end
end
end
Expand Down