Skip to content

Commit

Permalink
[Gemfile][DONOTMERGE] Bundle patches
Browse files Browse the repository at this point in the history
All the gems that require to be updated (mostly ones we own) that don't
have a Rails 6 release yet.

The only exception is manageiq-graphql at the moment, which relies on
the graphql-preload gem:

    https://github.com/ConsultingMD/graphql-preload

Currently commenting out graphql as a dependency for the moment to allow
us to move forward, but a long term decision will have to be made in the
future.
  • Loading branch information
NickLaMuro committed Nov 10, 2020
1 parent f9ef81c commit 554e78c
Showing 1 changed file with 15 additions and 7 deletions.
22 changes: 15 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ gem "ruport", "=1.7.0.3", :source => "https://rubygems.
# https://github.com/jeremyevans/ruby-american_date
gem "american_date"

# Rails 6 branch patches (DO NOT MERGE!)
# gem "activerecord-id_regions", :git => "https://github.com/NickLaMuro/activerecord-id_regions",
# :branch => "rails-6"

# Make sure to tag your new bundler group with the manageiq_default group in addition to your specific bundler group name.
# This default is used to automatically require all of our gems in processes that don't specify which bundler groups they want.
#
Expand Down Expand Up @@ -174,7 +178,8 @@ end

group :ovirt, :manageiq_default do
manageiq_plugin "manageiq-providers-ovirt"
gem "ovirt_metrics", "~>3.0.1", :require => false
gem "ovirt_metrics", :git => "https://github.com/NickLaMuro/ovirt_metrics",
:branch => "rails-6"
end

group :scvmm, :manageiq_default do
Expand All @@ -183,6 +188,8 @@ end

group :vmware, :manageiq_default do
manageiq_plugin "manageiq-providers-vmware"
gem "vmware_web_service", :git => "https://github.com/NickLaMuro/vmware_web_service",
:branch => "rails-6"
end

### shared dependencies
Expand All @@ -204,11 +211,11 @@ group :rest_api, :manageiq_default do
manageiq_plugin "manageiq-api"
end

group :graphql_api do
# Note, you still need to mount the engine in the UI / rest api processes:
# mount ManageIQ::GraphQL::Engine, :at => '/graphql'
manageiq_plugin "manageiq-graphql"
end
# group :graphql_api do
# # Note, you still need to mount the engine in the UI / rest api processes:
# # mount ManageIQ::GraphQL::Engine, :at => '/graphql'
# manageiq_plugin "manageiq-graphql"
# end

group :scheduler, :manageiq_default do
gem "rufus-scheduler"
Expand All @@ -230,7 +237,8 @@ end

group :ui_dependencies do # Added to Bundler.require in config/application.rb
manageiq_plugin "manageiq-decorators"
manageiq_plugin "manageiq-ui-classic"
gem "manageiq-ui-classic", :git => "https://github.com/NickLaMuro/manageiq-ui-classic",
:branch => "rails-6"
# Modified gems (forked on Github)
gem "jquery-rjs", :git => "https://github.com/NickLaMuro/jquery-rjs",
:branch => "rails-6"
Expand Down

0 comments on commit 554e78c

Please sign in to comment.