diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-10 03:09:53 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-10 03:09:53 +0000 |
commit | a8b811acdfb8200f30cdd70d290e87bb7ac46ab1 (patch) | |
tree | 2c99eda1590d125cbee2350e373a63fee4d76f44 /app/services/issuable | |
parent | d8995bd33ff3a76a6d04a6900229c78c2fbcc0a6 (diff) | |
download | gitlab-ce-a8b811acdfb8200f30cdd70d290e87bb7ac46ab1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/issuable')
-rw-r--r-- | app/services/issuable/import_csv/base_service.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/services/issuable/import_csv/base_service.rb b/app/services/issuable/import_csv/base_service.rb index 77a096e7586..5a2665285de 100644 --- a/app/services/issuable/import_csv/base_service.rb +++ b/app/services/issuable/import_csv/base_service.rb @@ -40,13 +40,12 @@ module Issuable csv_data = @csv_io.open(&:read).force_encoding(Encoding::UTF_8) validate_headers_presence!(csv_data.lines.first) - csv_parsing_params = { + CSV.new( + csv_data, col_sep: detect_col_sep(csv_data.lines.first), headers: true, header_converters: :symbol - } - - CSV.new(csv_data, csv_parsing_params).each.with_index(2) + ).each.with_index(2) end def validate_headers_presence!(headers) |