Rails 6.0

app/controllers/api/base_controller/logger.rb

@@ -29,7 +29,7 @@ def log_api_auth
       end
 
       def log_api_request
-        @parameter_filter ||= ActionDispatch::Http::ParameterFilter.new(Rails.application.config.filter_parameters)
+        @parameter_filter ||= ActiveSupport::ParameterFilter.new(Rails.application.config.filter_parameters)
         return unless api_log_info?
         log_request("Request", @req.to_hash)
         unfiltered_params = request.query_parameters

app/controllers/api/providers_controller.rb

@@ -175,7 +175,7 @@ def providers_options
 
       supported_providers = supported_types_for_create.map do |klass|
         if klass.supports_regions?
-          regions = klass.parent::Regions.all.sort_by { |r| r[:description] }.map { |r| r.slice(:name, :description) }
+          regions = klass.module_parent::Regions.all.sort_by { |r| r[:description] }.map { |r| r.slice(:name, :description) }
         end
 
         {

spec/requests/result_downloads_spec.rb

@@ -265,7 +265,7 @@ def task_results_url(task)
 
       expect(response).to have_http_status(:ok)
       expect(response.header["Content-Type"]).to eq("application/text")
-      expect(response.header["Content-Disposition"]).to eq("attachment; filename=\"results_#{result_1.id}_report.txt\"")
+      expect(response.header["Content-Disposition"]).to eq("attachment; filename=\"results_#{result_1.id}_report.txt\"; filename*=UTF-8''results_#{result_1.id}_report.txt")
       expect(response.body).to eq(task_results_1_txt)
     end
 
@@ -278,7 +278,7 @@ def task_results_url(task)
 
       expect(response).to have_http_status(:ok)
       expect(response.header["Content-Type"]).to eq("application/csv")
-      expect(response.header["Content-Disposition"]).to eq("attachment; filename=\"results_#{result_1.id}_report.csv\"")
+      expect(response.header["Content-Disposition"]).to eq("attachment; filename=\"results_#{result_1.id}_report.csv\"; filename*=UTF-8''results_#{result_1.id}_report.csv")
       expect(response.body).to eq(task_results_1_csv)
     end
 
@@ -304,7 +304,7 @@ def task_results_url(task)
 
       expect(response).to have_http_status(:ok)
       expect(response.header["Content-Type"]).to eq("application/pdf")
-      expect(response.header["Content-Disposition"]).to eq("attachment; filename=\"results_#{result_1.id}_report.pdf\"")
+      expect(response.header["Content-Disposition"]).to eq("attachment; filename=\"results_#{result_1.id}_report.pdf\"; filename*=UTF-8''results_#{result_1.id}_report.pdf")
       expect(response.body).to eq(task_results_1_pdf)
     end
   end

spec/requests/vms_spec.rb

@@ -306,7 +306,7 @@ def query_match_regexp(*tables)
 
       add_hardware_and_os_to_vms
 
-      host.update_attributes(:ext_management_system => ems)
+      host.update(:ext_management_system => ems)
     end
 
     it "removes N+1's from the index query for subcollections/virtual_attributes" do