summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-10-23 12:51:59 +0000
committerThiago Presa <tpresa@gitlab.com>2018-10-24 21:02:06 -0300
commitb9b68fe7d30778338625fb606457eb1886a17f08 (patch)
tree2c2e6afef6cf24a45bb029a8f25c5dc5bc647826
parentdaed01a5ca348e7d267b50e325bf58185617a0ad (diff)
downloadgitlab-ce-b9b68fe7d30778338625fb606457eb1886a17f08.tar.gz
Merge branch 'security-11-4-junit-test-report-exposes-stacktrace' into 'security-11-4'
[11.4] JUnit test reports endpoint exposes full stack trace in production mode See merge request gitlab/gitlabhq!2517
-rw-r--r--lib/gitlab/ci/parsers/test/junit.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/ci/parsers/test/junit.rb b/lib/gitlab/ci/parsers/test/junit.rb
index 5d7d9a751d8..ed5a79d9b9b 100644
--- a/lib/gitlab/ci/parsers/test/junit.rb
+++ b/lib/gitlab/ci/parsers/test/junit.rb
@@ -14,10 +14,10 @@ module Gitlab
test_case = create_test_case(test_case)
test_suite.add_test_case(test_case)
end
- rescue REXML::ParseException => e
- raise JunitParserError, "XML parsing failed: #{e.message}"
- rescue => e
- raise JunitParserError, "JUnit parsing failed: #{e.message}"
+ rescue REXML::ParseException
+ raise JunitParserError, "XML parsing failed"
+ rescue
+ raise JunitParserError, "JUnit parsing failed"
end
private