Merge pull request #663 from NickLaMuro/rails-6

Rails 6.0
ManageIQ · Jan 11, 2021 · 85f4199 · 85f4199
2 parents b294f0d + 2b20c81
commit 85f4199
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/manageiq/providers/openstack/cloud_manager.rb b/app/models/manageiq/providers/openstack/cloud_manager.rb
@@ -35,9 +35,9 @@ class ManageIQ::Providers::Openstack::CloudManager < ManageIQ::Providers::CloudM
   supports :provisioning
   supports :cloud_tenants
   supports :cloud_tenant_mapping do
-    if defined?(self.class.parent::CloudManager::CloudTenant) && !tenant_mapping_enabled?
+    if defined?(self.class.module_parent::CloudManager::CloudTenant) && !tenant_mapping_enabled?
       unsupported_reason_add(:cloud_tenant_mapping, _("Tenant mapping is disabled on the Provider"))
-    elsif !defined?(self.class.parent::CloudManager::CloudTenant)
+    elsif !defined?(self.class.module_parent::CloudManager::CloudTenant)
       unsupported_reason_add(:cloud_tenant_mapping, _("Tenant mapping is supported only when CloudTenant exists "\
                                                       "on the CloudManager"))
     end

diff --git a/manageiq-providers-openstack.gemspec b/manageiq-providers-openstack.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport",        "~> 5.2.4", ">= 5.2.4.3"
+  spec.add_dependency "activesupport",        "~> 6.0"
   spec.add_dependency "bunny",                "~> 2.1.0"
   spec.add_dependency "excon",                "~> 0.71"
   spec.add_dependency "fog-openstack",        ">= 0.3.10"