Merge pull request #18832 from jrafanie/fix_passing_argument_to_force…

…_association_reload_deprecation Correctly specify includes to fix a 5.0 deprecation
ManageIQ · May 31, 2019 · ff66d85 · ff66d85
2 parents 97cc0b8 + d217ea1
commit ff66d85
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/vmdb/appliance.rb b/lib/vmdb/appliance.rb
@@ -95,7 +95,7 @@ def self.log_server_identity
         startup.info("Server EVM id and name: #{s.id} #{s.name}")
 
         startup.info("Currently assigned server roles:")
-        s.assigned_server_roles(:include => :server_role).each { |r| startup.info("Role: #{r.server_role.name}, Priority: #{r.priority}") }
+        s.assigned_server_roles.includes(:server_role).each { |r| startup.info("Role: #{r.server_role.name}, Priority: #{r.priority}") }
 
         issue = `cat /etc/issue 2> /dev/null` rescue nil
         startup.info("OS: #{issue.chomp}") unless issue.blank?