Skip to content
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.

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

Support for Rails 6.1 #554

Merged
merged 5 commits into from Jan 8, 2021
Merged

Conversation

yknx4
Copy link
Contributor

@yknx4 yknx4 commented Dec 10, 2020

Required changes to support Rails 6.1

  • Remove deprecated method calls
  • Update Gemspec
  • Update Travis Config

@jsantos
Copy link
Contributor

jsantos commented Dec 10, 2020

@yknx4 Thanks for your contribution! If possible include a description on the PR, and we might also need to add Appraisals support including a gemfiles/rails61.gemfile, which should look like this:

# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", ">= 6.1.0", "< 6.2"
gem "mysql2", ">= 0.4.4", "< 0.6.0"
gem "pg", ">= 0.18", "< 2.0"
gem "sqlite3", "~> 1.4"

gemspec name: "audited", path: "../"

.travis.yml should also be updated so this new Gemfile would be used on the global test suite.

I was also working on this, so feel free to pick these changes from my WIP commit

@yknx4
Copy link
Contributor Author

yknx4 commented Dec 10, 2020

@jsantos on it ~ 👍

 - 6.1 gemfile
 - new appraisal
 - readme update
 - update to travis config

Co-authored-by: Jorge Oliveira Santos  <jorgeoliveirasantos@gmail.com>
@jsantos
Copy link
Contributor

jsantos commented Dec 16, 2020

Can any of the maintainers get this merged? I see some builds failing on the CI but these doesn't seem to be consistent... Tried to replicate locally with the same Ruby versions and all was clean. \cc @danielmorrison

@jmeattle
Copy link

Much appreciate all your hard work. It would be really great if this PR can be merged soon.

rubenarakelyan added a commit to resolving/audited that referenced this pull request Jan 5, 2021
This commit applies changes from collectiveidea#554 to support Rails 6.1.
@emileriksson
Copy link

Any updates on when this is getting merged??

@anmarchenko
Copy link

Is there anything we can do to help to get this merged?

@barrywoolgar
Copy link

Is there anything we can do to help to get this merged?

At a guess, managing to get all the CI tests to pass might help. Could be a Travis configuration issue as opposed to a problem with the PR changes, but not sure how that gets debugged without being a maintainer.

@danielmorrison danielmorrison merged commit 2e8f1ac into collectiveidea:master Jan 8, 2021
@danielmorrison
Copy link
Member

Thanks for the work @yknx4! Apologies that I've had zero time to look at this.

Thanks to @jmortlok for fixing the build. I merged a few easy things, and i'll cut a release soon.

malcolmbaig added a commit to malcolmbaig/audited that referenced this pull request Apr 7, 2021
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants