diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-11-16 11:49:40 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-11-16 11:49:40 +0000 |
| commit | 348dd42d797bafe2ffb64a2ed224c106726ea938 (patch) | |
| tree | 755f98c42dc7d3bc6b1498e46cd6df9ceaa230d7 /lib | |
| parent | 875bae16d0d3c1f026d658ab430878a73e3ac438 (diff) | |
| parent | 198f2a0b6149a2e7c069ad3aaad6ced9f5bb3ea1 (diff) | |
| download | gitlab-ce-348dd42d797bafe2ffb64a2ed224c106726ea938.tar.gz | |
Merge branch 'sh-use-nokogiri-xml-backend' into 'master'
Use Nokogiri as the ActiveSupport XML backend
Closes #54068
See merge request gitlab-org/gitlab-ce!23136
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/parsers/test/junit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/parsers/test/junit.rb b/lib/gitlab/ci/parsers/test/junit.rb index ed5a79d9b9b..2791730fd26 100644 --- a/lib/gitlab/ci/parsers/test/junit.rb +++ b/lib/gitlab/ci/parsers/test/junit.rb @@ -14,7 +14,7 @@ module Gitlab test_case = create_test_case(test_case) test_suite.add_test_case(test_case) end - rescue REXML::ParseException + rescue Nokogiri::XML::SyntaxError raise JunitParserError, "XML parsing failed" rescue raise JunitParserError, "JUnit parsing failed" |