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

Jump to bottom

Fix Rails 6 and Rails 6.1 Builds #559

Merged

danielmorrison merged 3 commits into collectiveidea:master from jmortlock:master

Jan 8, 2021

jmortlock commented Jan 7, 2021

WHY

Fixes the gem spec for Rails 6 so it does not pull in Rails 6.1 rc builds
Fixes the build in Rails 6.1 by not mocking the frozen object.

This should unlock at least the following two PRs #554 and #555

John Mortlock added 3 commits

January 8, 2021 08:10


          Fix so this does not pick up rails 6.1 rc versions

f36900c


          In Rails 6.1 the column hash is frozen so you cannot mock the type va…

50f5b5e

…lue directly


          Also update the appraisal rails6 version range

a4bb6e9

danielmorrison merged commit 97ac7b1 into collectiveidea:master

malcolmbaig added a commit to malcolmbaig/audited that referenced this pull request


          Merge upstream changes from collectiveidea/audited

dbb6590

Stay up to date with the original gem, including support for Rails 6.1
that was added since the fork.

From the changelog:

Added

- Add redacted option
[collectiveidea#485](collectiveidea#485)
- Rails 6.1. support
[collectiveidea#554](collectiveidea#554)
[collectiveidea#559](collectiveidea#559)

Improved

- Avoid extra query on first audit version
[collectiveidea#513](collectiveidea#513)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet