diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 18:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 18:08:59 +0300 |
| commit | 23288f62da73fb0e30d8e7ce306665e8fda1b932 (patch) | |
| tree | 2baf1339e4d7c7c35d6b8a52cfb90597a5d4cdf1 /app/views/projects | |
| parent | 7cc6872401eb487ed20dbb9d455f8bb9c97d9e39 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -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 f4560404c03..18bdbd42d0d 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -46,7 +46,7 @@ - if job.try(:trigger_request) %span.badge.badge-info= _('triggered') - if job.try(:allow_failure) - %span.badge.badge-danger= _('allowed to fail') + %span.badge.badge-warning= _('allowed to fail') - if job.schedulable? %span.badge.badge-info= s_('DelayedJobs|delayed') - elsif job.action? |