diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-11 14:33:03 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-11 14:33:03 +0200 |
| commit | 7ba5e4333bf9a7de67812a4ce7784a8757cbbd86 (patch) | |
| tree | dec10fb8104194ace28e90047d6c394d21a1c29d | |
| parent | ae83051ef9a3fad9dda89eaf537f07e1ba323f88 (diff) | |
| parent | 77bda265f47763e78ef0a3d4c0e8893e9ecfda69 (diff) | |
| download | gitlab-ce-7ba5e4333bf9a7de67812a4ce7784a8757cbbd86.tar.gz | |
Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| -rw-r--r-- | app/views/ci/admin/builds/_build.html.haml | 2 | ||||
| -rw-r--r-- | app/views/ci/admin/builds/index.html.haml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/ci/admin/builds/_build.html.haml b/app/views/ci/admin/builds/_build.html.haml index 1766ca39760..47f8df8f98e 100644 --- a/app/views/ci/admin/builds/_build.html.haml +++ b/app/views/ci/admin/builds/_build.html.haml @@ -1,7 +1,7 @@ - if build.commit && build.project %tr.build.alert{class: build_status_alert_class(build)} %td.build-link - = link_to ci_build_url(build) do + = link_to ci_project_build_url(build.project, build) do %strong #{build.id} %td.status diff --git a/app/views/ci/admin/builds/index.html.haml b/app/views/ci/admin/builds/index.html.haml index ab4ced54327..d23119162cc 100644 --- a/app/views/ci/admin/builds/index.html.haml +++ b/app/views/ci/admin/builds/index.html.haml @@ -22,6 +22,7 @@ %th Duration %th Finished at - = render @builds + - @builds.each do |build| + = render "ci/admin/builds/build", build: build = paginate @builds |