Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
318b4640
Commit
318b4640
authored
May 17, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use force_encoding(regex.encoding)
parent
a6f6056c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/ci/trace/stream.rb
lib/gitlab/ci/trace/stream.rb
+2
-2
No files found.
lib/gitlab/ci/trace/stream.rb
View file @
318b4640
...
...
@@ -74,7 +74,7 @@ module Gitlab
match
=
""
reverse_line
do
|
line
|
matches
=
line
.
force_encoding
(
Encoding
.
default_external
).
scan
(
regex
)
matches
=
line
.
force_encoding
(
regex
.
encoding
).
scan
(
regex
)
next
unless
matches
.
is_a?
(
Array
)
next
if
matches
.
empty?
...
...
@@ -86,7 +86,7 @@ module Gitlab
nil
rescue
# if bad regex or something goes wrong we dont want to interrupt transition
# so we just silent
r
ly ignore error for now
# so we just silently ignore error for now
end
private
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment