commit b610a687dec877659917db69696210af002aba2f

Author: Pavel Skrylev <majioa@altlinux.org>

Date:   Fri Oct 29 21:12:35 2021 +0300

    Fix fro Gemfile

diff --git a/Gemfile b/Gemfile

index 9975d7954..dd1e54a9b 100644

--- a/Gemfile

+++ b/Gemfile

@@ -5,4 +5,11 @@ require_relative 'config/boot_settings'

 source 'https://rubygems.org'

+gem 'psych', '4.0.3'

+gem 'net-smtp'

+gem 'net-pop'

+gem 'net-imap'

+gem 'rss'

+gem 'pry'

+

 gem 'rails', '~> 6.1.6'

@@ -15,7 +15,7 @@ gem 'apipie-rails', '< 1'

 gem 'apipie-dsl', '>= 2.2.6'

 # Pin rdoc to prevent updating bundled psych (https://github.com/ruby/rdoc/commit/ebe185c8775b2afe844eb3da6fa78adaa79e29a4)

 # Rails 6.0 is incompatible with Psych 4, Rails 6.1 should work

-gem 'rdoc', '< 6.4'

+gem 'rdoc', '< 7'

 gem 'rabl', '>= 0.15.0', '< 1'

 gem 'oauth', '~> 1.0'

 gem 'deep_cloneable', '>= 3', '< 4'

@@ -29,7 +29,7 @@ gem 'validates_lengths_from_database', '

 gem 'friendly_id', '>= 5.4.2', '< 6'

 gem 'secure_headers', '~> 6.3'

 gem 'safemode', '>= 1.3.5', '< 2'

-gem 'fast_gettext', '~> 1.4'

+gem 'fast_gettext', '~> 2.0'

 gem 'gettext_i18n_rails', '~> 1.8'

 gem 'rails-i18n', '~> 7.0'

 gem 'logging', '>= 1.8.0', '< 3.0.0'

@@ -54,9 +56,52 @@ gem 'bcrypt', '~> 3.1'

 gem 'get_process_mem'

 gem 'rack-cors', '~> 1.1', require: 'rack/cors'

 gem 'jwt', '>= 2.2.2', '< 3.0'

 gem 'graphql', '~> 1.13.0'

 gem 'graphql-batch'

-

-Dir["#{File.dirname(FOREMAN_GEMFILE)}/bundler.d/*.rb"].each do |bundle|

-  instance_eval(Bundler.read_file(bundle))

-end

+gem 'excon', '>= 0'

+gem 'coffee-script', '>= 0'

+gem 'msgpack', '>= 0'

+gem 'gridster-rails', '~> 0.5'

+gem 'spice-html5-rails', '~> 0.1.5'

+gem 'foreman_templates', '~> 9.3.0'

+gem 'foreman_remote_execution', '~> 8.0.0'

+gem 'foreman_discovery', '~> 21.0.3'

+gem 'foreman_ansible', '~> 10.0.0'#6.4.1'

+gem 'foreman-tasks', '~> 7.0.0'#5.1.1'

+gem 'foreman_default_hostgroup', '~> 6.0.0'

+gem 'foreman_puppet', '~> 4.0.3'#2.0.0'

+gem 'foreman_setup', '~> 8.0.1'#7.0.0'

+gem 'foreman_maintain', '~> 1.1.6'

+gem 'foreman_chef', '~> 0.10.0'

+gem 'foreman_hooks', '~> 0.3.17'

+gem 'foreman_api_client', '~> 1.0.2'

+gem 'foreman_monitoring', '~> 2.1.0'

+gem 'foreman_cert_revoke_host', '~> 0.1.2'

+# gem 'foreman_webhooks', '~> 3.0.5'

+gem 'fog-vsphere', '>= 3.5.0', '< 4.0', group: %i(vmware)

+gem 'rbvmomi', '~> 2.0', group: %i(vmware)

+gem 'prometheus-client'

+gem 'statsd-instrument'

+gem 'puma'

+gem 'redis', '~> 4.0', group: %i(redis)

+gem 'pg', '>= 0.18', '< 2.0', group: %i(postgresql)

+gem 'fog-ovirt', '>= 2.0.1', '< 3', group: %i(ovirt)

+gem 'fog-openstack', '>= 1.0.8', '< 2.0.0', group: %i(openstack)

+gem 'rack-openid', '~> 1.3', group: %i(openid)

+gem 'activerecord-nulldb-adapter', '>= 0'

+gem 'fog-libvirt', '>= 0.8.0', group: %i(libvirt)

+gem 'ruby-libvirt', '~> 0.8', require: ["libvirt"], group: %i(libvirt)

+gem 'rack-jsonp', '>= 0', require: ["rack/jsonp"], group: %i(jsonp)

+gem 'logging-journald', '~> 2.0', require: false, group: %i(journald)

+gem 'fog-google'

+gem 'facter', '>= 0', group: %i(facter)

+gem 'fog-aws', '>= 3.6.2', '< 4', group: %i(ec2)

+gem 'sidekiq', '~> 5.0', group: %i(dynflow_sidekiq)

+gem 'gitlab-sidekiq-fetcher', '>= 0', require: false, group: %i(dynflow_sidekiq)

+gem 'sd_notify', '~> 0.1', group: %i(dynflow_sidekiq)

+gem 'wirb', '>= 1.0', '< 3.0', group: %i(console)

+gem 'amazing_print', '~> 1.1', require: ["ap"], group: %i(console)

+gem 'jquery-ui-rails', '~> 6.0', group: %i(assets)

+gem 'patternfly-sass'

+gem 'gettext_i18n_rails_js', '~> 1.0', group: %i(assets)

+gem 'execjs', '>= 1.4.0', '< 3.0', group: %i(assets)

+gem 'uglifier', '>= 1.0.3', group: %i(assets)

+gem 'sass-rails', '~> 6.0', group: %i(assets)

+gem 'coffee-rails', '~> 5.0.0', group: %i(assets)