Skip to content
This repository has been archived by the owner on Aug 3, 2023. It is now read-only.

Rails 6.1 #5

Merged
merged 23 commits into from Dec 21, 2020
Merged

Rails 6.1 #5

merged 23 commits into from Dec 21, 2020

Conversation

lrworth
Copy link

@lrworth lrworth commented Dec 21, 2020

To support https://app.asana.com/0/1199554748152893/1199558463046799.

Merge from upstream, bumping version to 2.4.4 as both repositories have added a 2.4.3. Ideally we would push our custom changes upstream and get back in sync.

hashwin and others added 23 commits November 28, 2019 18:58
`gem update --system` fails with Ruby 2.2.
Update JRuby version to 9.2.8.0 + remove EOL Ruby 2.2
Calling `<<` to an ActiveModel::Errors message array in order to add an error is deprecated. Please call `ActiveModel::Errors#add` instead.
Bump activerecord dependency for Rails 6.1
…-in-gemspec

Update supported Rails version in paranoia.gemspec
Copy link
Member

@michaelwebb76 michaelwebb76 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ✔️

@lrworth
Copy link
Author

lrworth commented Dec 21, 2020

Note rubysherpas#442 being merged would remove the need for this repo entirely.

@lrworth lrworth merged commit 77f039c into core Dec 21, 2020
@lrworth lrworth deleted the rails-6-1 branch December 21, 2020 03:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
7 participants