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

ManageIQ · Aug 15, 2024 · e55aea0 · e55aea0
2 parents 230902f + 60b0ad1
commit e55aea0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -43,6 +43,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/app/models/manageiq/providers/awx/automation_manager/job.rb b/app/models/manageiq/providers/awx/automation_manager/job.rb
@@ -2,7 +2,7 @@ class ManageIQ::Providers::Awx::AutomationManager::Job <
   ManageIQ::Providers::ExternalAutomationManager::OrchestrationStack
 
   belongs_to :ext_management_system, :foreign_key => :ems_id, :class_name => "ManageIQ::Providers::AutomationManager"
-  belongs_to :job_template, :foreign_key => :configuration_script_id, :class_name => "ConfigurationScript"
+  belongs_to :job_template, :foreign_key => :configuration_script_id, :class_name => "::ConfigurationScript"
   belongs_to :playbook, :foreign_key => :configuration_script_base_id
 
   virtual_has_many :job_plays