-
Notifications
You must be signed in to change notification settings - Fork 896
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
Added permit_concurrent_loads #6861
Conversation
@@ -4,7 +4,8 @@ eval_gemfile(File.expand_path("gems/pending/Gemfile", __dir__)) | |||
# VMDB specific gems | |||
# | |||
|
|||
gem "rails", "~>5.0.x" | |||
gem "rails", :github => "rails/rails", :branch => "master" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we actually want to hang off of Rails master. cc @matthewd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm fine with this, until rc1 is cut (which will also be when 5-0-stable is branched)
The travis builds are failing while switching to rails master. Seems to be a rails issue related to validations. |
9997485
to
291a0d8
Compare
@@ -300,6 +300,7 @@ def validate_only_one_root | |||
end | |||
|
|||
def create_tenant_group | |||
reload |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems slightly neater to keep it all in one transaction to me... and this gives us a sensible place to hang the "see rails/rails#12345" comment
👍 👍 fixes provisioning for me, so looks good to me :-) |
291a0d8
to
617d3af
Compare
<pr_mergeability_checker />This pull request is not mergeable. Please rebase and repush. |
Also fixes a hang while trying to add a new catalog item and choosing a type.. |
Fixes ManageIQ#6814 The Automate methods were hanging when loading constants, which trigger require processing.
617d3af
to
4c86bbd
Compare
❤️ Let's merge when green. 🎉 |
Checked commit mkanoor@4c86bbd with ruby 2.2.3, rubocop 0.37.2, and haml-lint 0.16.1 |
Added permit_concurrent_loads
Fixes #6814
The Automate methods were hanging when loading constants, which
trigger require processing.