diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 03:09:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 03:09:07 +0000 |
| commit | d393deba773bb1fab09273850fe5d5986066d76d (patch) | |
| tree | b08d599196d09a91561f6f43b9c5660987060ecb /app/views/projects/ci | |
| parent | 32fd4cd5e2134511936899d6bcc4aaf18b9be6fd (diff) | |
| download | gitlab-ce-d393deba773bb1fab09273850fe5d5986066d76d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/ci')
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 18bdbd42d0d..4c20ac84b24 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -45,7 +45,7 @@ = tag - if job.try(:trigger_request) %span.badge.badge-info= _('triggered') - - if job.try(:allow_failure) + - if job.try(:allow_failure) && !job.success? %span.badge.badge-warning= _('allowed to fail') - if job.schedulable? %span.badge.badge-info= s_('DelayedJobs|delayed') |