summaryrefslogtreecommitdiff
path: root/app/services/issues
diff options
context:
space:
mode:
authorHeinrich Lee Yu <hleeyu@gmail.com>2018-12-31 16:39:43 +0800
committerHeinrich Lee Yu <hleeyu@gmail.com>2019-01-07 11:16:58 +0800
commite2698d5d7455d91fa94f9bbf1fc838f8cb142700 (patch)
tree900a7abd2983a5a31843c25a13ce06898c1e02d6 /app/services/issues
parent63e9969ca3ac57839b78d9cc44bcf32bc9a45248 (diff)
downloadgitlab-ce-e2698d5d7455d91fa94f9bbf1fc838f8cb142700.tar.gz
Improve email messages
Also refactored cleanup view to use the same localized string
Diffstat (limited to 'app/services/issues')
-rw-r--r--app/services/issues/import_csv_service.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/issues/import_csv_service.rb b/app/services/issues/import_csv_service.rb
index 411000a7066..7fa2ecc3afd 100644
--- a/app/services/issues/import_csv_service.rb
+++ b/app/services/issues/import_csv_service.rb
@@ -6,7 +6,7 @@ module Issues
@user = user
@project = project
@uploader = upload.build_uploader
- @results = { success: 0, errors: [], valid_file: true }
+ @results = { success: 0, error_lines: [], parse_error: false }
end
def execute
@@ -30,11 +30,11 @@ module Issues
if issue.persisted?
@results[:success] += 1
else
- @results[:errors].push(line_no)
+ @results[:error_lines].push(line_no)
end
end
rescue ArgumentError, CSV::MalformedCSVError
- @results[:valid_file] = false
+ @results[:parse_error] = true
end
def email_results_to_user