Merge remote-tracking branch 'origin/master' into radjabov

ManageIQ · Aug 15, 2024 · 7afa8d5 · 7afa8d5
2 parents 2a3306b + 3650b8b
commit 7afa8d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -44,6 +44,6 @@ jobs:
     - name: Run tests
       run: bundle exec rake
     - name: Report code coverage
-      if: "${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.0' }}"
+      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
       continue-on-error: true
-      uses: paambaati/codeclimate-action@v6
+      uses: paambaati/codeclimate-action@v8
diff --git a/.whitesource b/.whitesource
@@ -1,4 +1,3 @@
 {
   "settingsInheritedFrom": "ManageIQ/whitesource-config@master"
 }
-
diff --git a/spec/models/manageiq/providers/openstack/cloud_manager/provision/volume_attachment_spec.rb b/spec/models/manageiq/providers/openstack/cloud_manager/provision/volume_attachment_spec.rb
@@ -6,7 +6,8 @@
     @volume = FactoryBot.create(:cloud_volume_openstack)
 
     # We're storing objects in the instance_type, so we must permit loading this class
-    ActiveRecord::Base.yaml_column_permitted_classes = ActiveRecord::Base.yaml_column_permitted_classes | [@flavor.class]
+    ActiveRecord.yaml_column_permitted_classes = YamlPermittedClasses.app_yaml_permitted_classes | [@flavor.class]
+
     @task = FactoryBot.create(:miq_provision_openstack,
                                :source  => @template,
                                :state   => 'pending',