Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

2 files changed, 40 insertions, 0 deletions

diff --git a/app/services/issuable/bulk_update_service.rb b/app/services/issuable/bulk_update_service.rb
index 79be771b3fb..d3d543edcd7 100644
--- a/app/services/issuable/bulk_update_service.rb
+++ b/app/services/issuable/bulk_update_service.rb
@@ -34,6 +34,8 @@ module Issuable
     def permitted_attrs(type)
       attrs = %i(state_event milestone_id add_label_ids remove_label_ids subscription_event)
 
+      attrs.push(:sprint_id) if type == 'issue'
+
       if type == 'issue' || type == 'merge_request'
         attrs.push(:assignee_ids)
       else
diff --git a/app/services/issuable/export_csv/base_service.rb b/app/services/issuable/export_csv/base_service.rb
new file mode 100644
index 00000000000..49ff05935c9
--- /dev/null
+++ b/app/services/issuable/export_csv/base_service.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Issuable
+  module ExportCsv
+    class BaseService
+      # Target attachment size before base64 encoding
+      TARGET_FILESIZE = 15.megabytes
+
+      def initialize(issuables_relation, project)
+        @issuables = issuables_relation
+        @project = project
+      end
+
+      def csv_data
+        csv_builder.render(TARGET_FILESIZE)
+      end
+
+      private
+
+      attr_reader :project, :issuables
+
+      # rubocop: disable CodeReuse/ActiveRecord
+      def csv_builder
+        @csv_builder ||=
+          CsvBuilder.new(issuables.preload(associations_to_preload), header_to_value_hash)
+      end
+      # rubocop: enable CodeReuse/ActiveRecord
+
+      def associations_to_preload
+        []
+      end
+
+      def header_to_value_hash
+        raise NotImplementedError
+      end
+    end
+  end
+end