diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-17 14:30:42 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-17 14:30:42 +0800 |
| commit | ee3b0c3a9ad0823f86b5c798c47c343a812228d0 (patch) | |
| tree | c68fa2a725056ea2d0e067bd84bbc1be5d00bd05 /lib/gitlab/ci | |
| parent | eeaeb2752a589c9046659d58d4a3f6be8030b699 (diff) | |
| download | gitlab-ce-ee3b0c3a9ad0823f86b5c798c47c343a812228d0.tar.gz | |
Make sure we're giving Encoding.default_external
Diffstat (limited to 'lib/gitlab/ci')
| -rw-r--r-- | lib/gitlab/ci/trace/stream.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ci/trace/stream.rb b/lib/gitlab/ci/trace/stream.rb index 3b335cdfd01..33141d0d88d 100644 --- a/lib/gitlab/ci/trace/stream.rb +++ b/lib/gitlab/ci/trace/stream.rb @@ -14,6 +14,7 @@ module Gitlab def initialize @stream = yield + @stream.binmode end def valid? @@ -51,7 +52,7 @@ module Gitlab read_last_lines(last_lines) else stream.read - end + end.force_encoding(Encoding.default_external) end def html_with_state(state = nil) @@ -113,7 +114,6 @@ module Gitlab end chunks.join.lines.last(last_lines).join - .force_encoding(Encoding.default_external) end end end |