Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 6 deletions

diff --git a/app/services/issuable/import_csv/base_service.rb b/app/services/issuable/import_csv/base_service.rb
index 6ab8ec79f41..1a05073554e 100644
--- a/app/services/issuable/import_csv/base_service.rb
+++ b/app/services/issuable/import_csv/base_service.rb
@@ -21,13 +21,9 @@ module Issuable
 
       def process_csv
         with_csv_lines.each do |row, line_no|
-          issuable_attributes = {
-            title: row[:title],
-            description: row[:description],
-            due_date: row[:due_date]
-          }
+          attributes = issuable_attributes_for(row)
 
-          if create_issuable(issuable_attributes).persisted?
+          if create_issuable(attributes).persisted?
             @results[:success] += 1
           else
             @results[:error_lines].push(line_no)
@@ -37,6 +33,14 @@ module Issuable
         @results[:parse_error] = true
       end
 
+      def issuable_attributes_for(row)
+        {
+          title:       row[:title],
+          description: row[:description],
+          due_date:    row[:due_date]
+        }
+      end
+
       def with_csv_lines
         csv_data = @csv_io.open(&:read).force_encoding(Encoding::UTF_8)
         validate_headers_presence!(csv_data.lines.first)