diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 06:07:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 06:07:47 +0000 |
| commit | d2b64c37bdef067656fdc8deb4728a2fbc6c2729 (patch) | |
| tree | 5cab5936f9c176f81d9749baf4ccbdcf94be9e64 /lib | |
| parent | 4560c92ab1954cf0416bafc45d1fa671fcacb3c3 (diff) | |
| download | gitlab-ce-d2b64c37bdef067656fdc8deb4728a2fbc6c2729.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/parsers/test/junit.rb | 7 | ||||
| -rw-r--r-- | lib/gitlab/git/hook_env.rb | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lib/gitlab/ci/parsers/test/junit.rb b/lib/gitlab/ci/parsers/test/junit.rb index c3e4c88d077..33140b4c7fd 100644 --- a/lib/gitlab/ci/parsers/test/junit.rb +++ b/lib/gitlab/ci/parsers/test/junit.rb @@ -47,13 +47,16 @@ module Gitlab end def create_test_case(data, args) - if data['failure'] + if data.key?('failure') status = ::Gitlab::Ci::Reports::TestCase::STATUS_FAILED system_output = data['failure'] attachment = attachment_path(data['system_out']) - elsif data['error'] + elsif data.key?('error') status = ::Gitlab::Ci::Reports::TestCase::STATUS_ERROR system_output = data['error'] + elsif data.key?('skipped') + status = ::Gitlab::Ci::Reports::TestCase::STATUS_SKIPPED + system_output = data['skipped'] else status = ::Gitlab::Ci::Reports::TestCase::STATUS_SUCCESS system_output = nil diff --git a/lib/gitlab/git/hook_env.rb b/lib/gitlab/git/hook_env.rb index 892a069a3b7..f93ab19fc65 100644 --- a/lib/gitlab/git/hook_env.rb +++ b/lib/gitlab/git/hook_env.rb @@ -4,12 +4,13 @@ module Gitlab module Git - # Ephemeral (per request) storage for environment variables that some Git - # commands need during internal API calls made from Git push hooks. + # Ephemeral (per request) storage for environment variables that some + # Git commands need during internal API calls made from the Git + # pre-receive push hook. # - # For example, in pre-receive hooks, new objects are put in a temporary - # $GIT_OBJECT_DIRECTORY. Without it set, the new objects cannot be retrieved - # (this would break push rules for instance). + # See + # https://gitlab.com/gitlab-org/gitaly/-/blob/master/doc/object_quarantine.md#gitlab-and-git-object-quarantine + # for more information. # # This class is thread-safe via RequestStore. class HookEnv |