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 and test Rails 6.0 #494

Merged
merged 6 commits into from
May 9, 2019
Merged

Conversation

domcleal
Copy link
Collaborator

@domcleal domcleal commented May 7, 2019

Includes Ruby 2.6 in the test matrix, fixes a deprecation and a couple of small issues that prevented tests running correctly on Rails 6.0.

Fixes #488

domcleal added 6 commits May 7, 2019 15:46
Add correct DB adapter gems to each version to avoid gem activation
errors, but ensure the main gemspec can match all permitted versions.

Fixes collectiveidea#488
Soft-deprecated since Rails 4.0 but in Rails 6.0 it now prints a
deprecation warning, so switch it out for `update!` (preferring the bang
version to pick up on any errors).
The adapter only defaults to utf8mb4 on newer MySQL versions, else
requires a specific charset under Rails 6.0 for our version.
No support for 2.6 (or HEAD) on Rails 4.2, exclude it.
@domcleal
Copy link
Collaborator Author

domcleal commented May 7, 2019

The CI build statuses seem to be missing (one for @danielmorrison, might need to try reinstalling the Travis CI integration), but the PR builds are running. Here's the link: https://travis-ci.org/collectiveidea/audited/builds/529345653

@danielmorrison
Copy link
Member

@domcleal I reinstalled the integration. Not sure it will show up on this PR, but I think it should on future ones…

@domcleal
Copy link
Collaborator Author

domcleal commented May 7, 2019

@danielmorrison thanks!

@domcleal domcleal merged commit f73a6cf into collectiveidea:master May 9, 2019
@domcleal domcleal deleted the rails60 branch May 9, 2019 08:11
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.

Support for Rails 6
2 participants