Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Redmine4.1でcsvファイルがimportされないバグを修正 #11

Merged
merged 9 commits into from
Feb 14, 2020
Merged

Redmine4.1でcsvファイルがimportされないバグを修正 #11

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e193c1
Redmine4.1でcsvファイルがimportされないバグを修正
Feb 6, 2020
2685399
Use ruby 2.6
hanachin Feb 6, 2020
fddb253
csvの仕様変更によりテストコードを修正
Feb 6, 2020
efe7075
Merge branch 'bug/fix_import_bug' of https://github.com/agileware-jp/…
Feb 6, 2020
f2e7bef
CircleCIのバージョンアップとCSRF検証をスキップさせるコードを削除
Feb 6, 2020
f55afad
Parse csv_data as UTF-8
hanachin Feb 6, 2020
f9f97be
csv形式とフィいるフォーマットのエンコードが違っていても画面が転移できてしまう点を修正
Feb 10, 2020
c2bf475
テストコードを修正
Feb 10, 2020
02ef511
修正前のコードに戻す
Kang-Yuchan Feb 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
version: 2.1

orbs:
redmine: agileware-jp/redmine-plugin@0.0.14
redmine: agileware-jp/redmine-plugin@0.0.25

workflows:
version: 2
test:
jobs:
- redmine/download:
name: 'redmine40-download'
redmine_version: '4.0.4'
name: 'redmine41-download'
redmine_version: '4.1.0'
- redmine/test:
name: 'redmine40-test'
executor: redmine/ruby-pg
requires: [redmine40-download]
name: 'redmine41-test'
executor: redmine/ruby-26-pg
requires: [redmine41-download]
4 changes: 2 additions & 2 deletions app/controllers/importer_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def result


csv_opt = {:headers=>true,
:encoding=>iip.encoding,
:encoding=>'UTF-8',
:quote_char=>iip.quote_char,
:col_sep=>iip.col_sep}
CSV.new(iip.csv_data, csv_opt).each do |row|
Expand Down Expand Up @@ -593,7 +593,7 @@ def sample_data(iip)

begin
CSV.new(iip.csv_data, {:headers=>true,
:encoding=>iip.encoding,
:encoding=>'UTF-8',
:quote_char=>iip.quote_char,
:col_sep=>iip.col_sep}).each_with_index do |row, i|
@samples[i] = row
Expand Down