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.

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

Fixes #29558 - use Rails 6 on Ruby >= 2.6 #7322

Merged
merged 3 commits into from
Apr 17, 2020
Merged

Fixes #29558 - use Rails 6 on Ruby >= 2.6 #7322

merged 3 commits into from
Apr 17, 2020

Conversation

mmoll
Copy link
Contributor

@mmoll mmoll commented Jan 2, 2020 •
edited
Loading

No description provided.

@theforeman theforeman deleted a comment from houndci-bot Jan 2, 2020
@mmoll
Copy link
Contributor Author

mmoll commented Jan 2, 2020

Needs to wait for a newer PostgreSQL on the Jenkins slaves.

@tbrisker tbrisker added the WIP label Feb 19, 2020
@mmoll
Copy link
Contributor Author

mmoll commented Feb 23, 2020

Indeed green with PG 12. 💚

@amirfefer
Copy link
Member

After a deep investigation about graphql test failures, I assume the reason is ActiveRecord::Associations::Preloader which we use here
The given base_scope is similar, but the results after the preloading are not as expected with rails 6.

I searched for an issue in rails repo, and I found this one and some more.

Also as far as I understand, ActiveRecord::Associations::Preloader is for internal use and isn't exposed as a public API.

@tbrisker tbrisker mentioned this pull request Apr 5, 2020
Merged
@ezr-ondrej
Copy link
Member

@mmoll could you rebase and reenable the graphql tests?

@mmoll mmoll changed the title [WIP] Rails 6.0 Fixes #29558 - use Rails 6 on Ruby >= 2.6 Apr 17, 2020
@mmoll mmoll marked this pull request as ready for review April 17, 2020 10:41
@theforeman theforeman deleted a comment from tbrisker Apr 17, 2020
@theforeman theforeman deleted a comment from theforeman-bot Apr 17, 2020
@mmoll mmoll removed Legacy JS PRs making changes in the legacy Javascript stack UI WIP labels Apr 17, 2020
@theforeman theforeman deleted a comment from theforeman-bot Apr 17, 2020
@mmoll
Copy link
Contributor Author

mmoll commented Apr 17, 2020

Looks all green and ready to me 😃

ezr-ondrej
ezr-ondrej approved these changes Apr 17, 2020
View reviewed changes
Copy link
Member

@ezr-ondrej ezr-ondrej left a comment

Choose a reason for hiding this comment

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

Thanks @mmoll 💚 !
Let's do this!

@ezr-ondrej ezr-ondrej merged commit 2f73d13 into theforeman:develop Apr 17, 2020
@mmoll mmoll deleted the rails6_jenkins_pr branch April 17, 2020 11:57
@tbrisker tbrisker mentioned this pull request Apr 17, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tbrisker tbrisker tbrisker left review comments

@ezr-ondrej ezr-ondrej ezr-ondrej approved these changes

Assignees
No one assigned
Labels
Needs testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mmoll @amirfefer @ezr-ondrej @tbrisker @theforeman-bot