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

Fix gem issues related to rails 5.0 release #9667

Merged
merged 3 commits into from Jul 9, 2016

Conversation

bdunne
Copy link
Member

@bdunne bdunne commented Jul 7, 2016

Rails 5 has a minimum Ruby version of 2.2.2. Several of our gems depend on ActiveSupport. In order to support older Ruby versions in our gems, I've added blank to more_core_extensions and dropped the dependencies on activesupport.

@bdunne
Copy link
Member Author

bdunne commented Jul 7, 2016

Includes ManageIQ/ovirt#55

@jhernand
Copy link
Contributor

jhernand commented Jul 8, 2016

@bdunne, @chessbyte, note that the change to use the version 0.11.0 of the ovirt gem is needed to fix bug 1352967, so eventually it will need to be backported to the darga branch. Are you planning to also backport the other Rails 5 changes included in this PR?

@miq-bot
Copy link
Member

miq-bot commented Jul 8, 2016

<pr_mergeability_checker />This pull request is not mergeable. Please rebase and repush.

@chessbyte
Copy link
Member

@bdunne please rebase and push again

@chessbyte
Copy link
Member

@jhernand if you need a gem change to fix bug 1352967, please make PR and label it as darga/yes

@miq-bot
Copy link
Member

miq-bot commented Jul 8, 2016

Checked commits bdunne/manageiq@dbf1872~...4ea7bea with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
3 files checked, 1 offense detected

gems/pending/util/miq-system.rb

@bdunne bdunne mentioned this pull request Jul 9, 2016
@bdunne bdunne changed the title [WIP] Fix gem issues related to rails 5.0 release Fix gem issues related to rails 5.0 release Jul 9, 2016
@bdunne
Copy link
Member Author

bdunne commented Jul 9, 2016

@miq-bot rm_label wip

@miq-bot miq-bot removed the wip label Jul 9, 2016
@Fryguy Fryguy merged commit f050c9e into ManageIQ:master Jul 9, 2016
@Fryguy Fryguy added this to the Sprint 43 Ending July 11, 2016 milestone Jul 9, 2016
@Fryguy Fryguy added darga/no and removed darga/no labels Jul 9, 2016
@Fryguy
Copy link
Member

Fryguy commented Jul 9, 2016

@bdunne Is this darga/yes or darga/no?

@bdunne bdunne deleted the upgrade_gems branch July 10, 2016 04:36
@chessbyte
Copy link
Member

@bdunne @Fryguy darga?

@bdunne
Copy link
Member Author

bdunne commented Jul 11, 2016

I would say darga/yes since @jhernand needs the changes in the ovirt gem and I don't think you can bundle without all of the gem changes in this PR.

@chessbyte
Copy link
Member

@bdunne running git cherry-pick -x -m 1 f050c9e on darga causes merge conflicts.

Please make PR against Darga

@jhernand
Copy link
Contributor

/cc @durandom

chessbyte added a commit that referenced this pull request Jul 13, 2016
[DARGA] Backport #9667 Fix gem issues related to rails 5.0 release
@chessbyte
Copy link
Member

Backported to Darga via #9756

@jhernand
Copy link
Contributor

Thanks @chessbyte and @bdunne .

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

Successfully merging this pull request may close these issues.

None yet

5 participants