diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 15:06:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 15:06:20 +0300 |
| commit | 791785af5540d18eaa97da24f9ff8638e1960b72 (patch) | |
| tree | caeb6f08d9cc10a0052dc6851b46653d94c29022 /lib/gitlab/ci | |
| parent | a92d6b36c2d2892e8c070efb169f0c06815900ee (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci')
| -rw-r--r-- | lib/gitlab/ci/ansi2json/converter.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/ci/ansi2json/converter.rb b/lib/gitlab/ci/ansi2json/converter.rb index 908e560999e..cbda3808b86 100644 --- a/lib/gitlab/ci/ansi2json/converter.rb +++ b/lib/gitlab/ci/ansi2json/converter.rb @@ -66,14 +66,12 @@ module Gitlab elsif scan_token(scanner, /\e(([@-_])(.*?)?)?$/) # stop scanning scanner.terminate - elsif scan_token(scanner, /</) - @state.current_line << '<' elsif scan_token(scanner, /\r?\n/) flush_current_line elsif scan_token(scanner, /\r/) # drop last line @state.current_line.clear! - elsif scan_token(scanner, /.[^\e<\r\ns]*/m) + elsif scan_token(scanner, /.[^\e\r\ns]*/m) # this is a join from all previous tokens and first letters # it always matches at least one character `.` # it matches everything that is not start of: |