diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-15 18:50:12 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-15 18:50:12 +0300 |
| commit | bbfe15491e496bad0b532b9607d3b380c98206c9 (patch) | |
| tree | ab249c1756bf9fa68ead6f2d7d0fda2995f8de9a /app/views | |
| parent | 6f50cef8094d9b14d2bdff731f0eeb01c31516bf (diff) | |
| parent | 89e50a0264c4651b9c2f4ac2981b9b1d95de2875 (diff) | |
Merge branch 'ci-fix-double-borders' into 'master'
Fix double borders around the CI status
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14281
Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2760#note_4238291
See merge request !3224
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 7123efffd5b..d22d1da8402 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -1,8 +1,7 @@ %tr.build %td.status - if can?(current_user, :read_build, build) - = link_to namespace_project_build_url(build.project.namespace, build.project, build), class: "ci-status ci-#{build.status}" do - = ci_status_with_icon(build.status) + = ci_status_with_icon(build.status, namespace_project_build_url(build.project.namespace, build.project, build)) - else = ci_status_with_icon(build.status) 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 4143ea13063..c15386b4883 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 @@ -1,8 +1,7 @@ %tr.generic_commit_status %td.status - if can?(current_user, :read_commit_status, generic_commit_status) && generic_commit_status.target_url - = link_to generic_commit_status.target_url, class: "ci-status ci-#{generic_commit_status.status}" do - = ci_status_with_icon(generic_commit_status.status) + = ci_status_with_icon(generic_commit_status.status, generic_commit_status.target_url) - else = ci_status_with_icon(generic_commit_status.status) |