Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-23 21:10:06 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-23 21:10:06 +0300
commit4a6e6c740b131b6291d553fcdab5a0612f8c099b (patch)
treec9b31140b4161e25f5395447272187e344ea9ca1 /lib/gitlab/ci/ansi2html.rb
parent228eb2ee910e2fb7f9bedf713c43a30c55cf3314 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/ansi2html.rb')
-rw-r--r--lib/gitlab/ci/ansi2html.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/ci/ansi2html.rb b/lib/gitlab/ci/ansi2html.rb
index 97988d8aa13..ef936581c10 100644
--- a/lib/gitlab/ci/ansi2html.rb
+++ b/lib/gitlab/ci/ansi2html.rb
@@ -33,6 +33,8 @@ module Gitlab
Result = Struct.new(:html, :state, :append, :truncated, :offset, :size, :total, keyword_init: true) # rubocop:disable Lint/StructNewOverride
class Converter
+ include EncodingHelper
+
def on_0(_)
reset
end
@@ -256,6 +258,7 @@ module Gitlab
start_offset = @offset
stream.each_line do |line|
+ line = encode_utf8_no_detect(line)
s = StringScanner.new(line)
until s.eos?