diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-29 18:09:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-29 18:09:12 +0300 |
| commit | 4dfd78cb55b08ab20124187d1aab6a431da3e302 (patch) | |
| tree | a14b0086833e11b88bc023455b7c1bc8d8dbc5f4 /app/views/projects/generic_commit_statuses | |
| parent | 5a7d44a955572b912d13ba8949e976f61b5c7f1b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/generic_commit_statuses')
| -rw-r--r-- | app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml index e341831e17d..1d9aad81a9e 100644 --- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml +++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml @@ -19,7 +19,7 @@ - if ref - if generic_commit_status.ref .icon-container - = generic_commit_status.tags.any? ? icon('tag') : sprite_icon('fork', size: 10) + = generic_commit_status.tags.any? ? sprite_icon('tag', size: 10) : sprite_icon('fork', size: 10) = link_to generic_commit_status.ref, project_commits_path(generic_commit_status.project, generic_commit_status.ref) - else .light none @@ -30,7 +30,8 @@ = link_to generic_commit_status.short_sha, project_commit_path(generic_commit_status.project, generic_commit_status.sha), class: "commit-sha" - if retried - = icon('warning', class: 'text-warning has-tooltip', title: 'Status was retried.') + %span.has-tooltip{ title: _('Status was retried.') } + = sprite_icon('warning-solid', class: 'text-warning') .label-container - if generic_commit_status.tags.any? |