summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-10-23 12:52:02 +0000
committerThiago Presa <tpresa@gitlab.com>2018-10-24 21:39:48 -0300
commitbb3ad8e7a19ad1e2b70537f44453e0030fe741d5 (patch)
treea54efc6ad4bffbeb5b185bca276f6eb0ee87de79
parent5e399e91775e11479d68e0b96bdff43c4d42eed6 (diff)
downloadgitlab-ce-bb3ad8e7a19ad1e2b70537f44453e0030fe741d5.tar.gz
Merge branch 'security-11-3-junit-test-report-exposes-stacktrace' into 'security-11-3'
[11.3] JUnit test reports endpoint exposes full stack trace in production mode See merge request gitlab/gitlabhq!2516
-rw-r--r--lib/gitlab/ci/parsers/junit.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/ci/parsers/junit.rb b/lib/gitlab/ci/parsers/junit.rb
index d1c136f2009..6e387c2d52c 100644
--- a/lib/gitlab/ci/parsers/junit.rb
+++ b/lib/gitlab/ci/parsers/junit.rb
@@ -11,10 +11,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