summaryrefslogtreecommitdiff
path: root/app/views/projects/commits
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-25 09:14:48 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-25 09:14:48 +0000
commit9b937046144f467649c966a2a1979050cd826f3e (patch)
tree91dfdbacda5cd4cfeda1db43215d2e47e09246d7 /app/views/projects/commits
parent3c23b6515fcba75b891763d3033d6c7a3eb4d4a6 (diff)
parent5615f2737cb034d3d8de70e1e50f1ba8ca78c34d (diff)
downloadgitlab-ce-9b937046144f467649c966a2a1979050cd826f3e.tar.gz
Merge branch 'ci-status-mr-index' into 'master'
Ci status for merge requests index page ![ci-mr-index](/uploads/1424564c87ac6ff5fb2c4bc260fbebdf/ci-mr-index.png) See merge request !1682
Diffstat (limited to 'app/views/projects/commits')
-rw-r--r--app/views/projects/commits/_commit.html.haml3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index e80cc194d29..805be332e64 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -18,8 +18,7 @@
.pull-right
- if ci_commit
- = link_to ci_status_path(ci_commit), class: "c#{ci_status_color(ci_commit)}" do
- = ci_status_icon(ci_commit)
+ = render_ci_status(ci_commit)
&nbsp;
= clipboard_button
= link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit_short_id", data: {clipboard_text: commit.id}