Merge branch 'rails5-fix-6930' into 'master'

Rails5 fix no implicit conversion of Symbol into Integer

Closes #6930

See merge request gitlab-org/gitlab-ee!6582

ee/app/controllers/ee/projects/issues_controller.rb

@@ -16,7 +16,7 @@ module EE
       end
 
       def export_csv
-        ExportCsvWorker.perform_async(current_user.id, project.id, filter_params)
+        ExportCsvWorker.perform_async(current_user.id, project.id, filter_params.to_h)
 
         index_path = project_issues_path(project)
         redirect_to(index_path, notice: "Your CSV export has started. It will be emailed to #{current_user.notification_email} when complete.")

ee/changelogs/unreleased/rails5-fix-6930.yml

+---
+title: Rails5 fix no implicit conversion of Symbol into Integer
+merge_request: 6582
+author: Jasper Maes
+type: fixed

ee/spec/features/issues/csv_spec.rb

@@ -29,13 +29,13 @@ describe 'Issues csv' do
   end
 
   it 'triggers an email export' do
-    expect(ExportCsvWorker).to receive(:perform_async).with(user.id, project.id, hash_including(project_id: project.id))
+    expect(ExportCsvWorker).to receive(:perform_async).with(user.id, project.id, hash_including("project_id" => project.id))
 
     request_csv
   end
 
   it "doesn't send request params to ExportCsvWorker" do
-    expect(ExportCsvWorker).to receive(:perform_async).with(anything, anything, hash_excluding(controller: anything, action: anything))
+    expect(ExportCsvWorker).to receive(:perform_async).with(anything, anything, hash_excluding("controller" => anything, "action" => anything))
 
     request_csv
   end