Commit 1df62a12 authored by Fatih Acet's avatar Fatih Acet

Merge branch '198052-in-the-jobs-page-the-allowed-to-fail-badge-looks-like-an-error' into 'master'

Don't show tag "allowed to fail" when the job was successful

Closes #198052

See merge request gitlab-org/gitlab!25458
parents cef99acd 6d712890
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
= tag = tag
- if job.try(:trigger_request) - if job.try(:trigger_request)
%span.badge.badge-info= _('triggered') %span.badge.badge-info= _('triggered')
- if job.try(:allow_failure) - if job.try(:allow_failure) && !job.success?
%span.badge.badge-warning= _('allowed to fail') %span.badge.badge-warning= _('allowed to fail')
- if job.schedulable? - if job.schedulable?
%span.badge.badge-info= s_('DelayedJobs|delayed') %span.badge.badge-info= s_('DelayedJobs|delayed')
......
---
title: Hides the "Allowed to fail" tag on jobs that are successful
merge_request: 25458
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment