diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:02:13 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:06:55 +0100 |
| commit | 9907a7e6ed7dbfac4c927cefd16ac8e4b3c681f6 (patch) | |
| tree | 2b2482e98437bf73d3fde685f7091105412a9e15 /app/views/projects/merge_requests/widget/_heading.html.haml | |
| parent | 35fd7112bfc65d5773a64359f108d3c252885479 (diff) | |
| download | gitlab-ce-9907a7e6ed7dbfac4c927cefd16ac8e4b3c681f6.tar.gz | |
Get ci_commit in MR controller
Diffstat (limited to 'app/views/projects/merge_requests/widget/_heading.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index ba5ad22bca7..49aab961712 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -1,13 +1,12 @@ -- ci_commit = @merge_request.ci_commit -- if ci_commit - - status = ci_commit.status +- if @ci_commit + - status = @ci_commit.status .mr-widget-heading .ci_widget{class: "ci-#{status}"} - = ci_status_icon(ci_commit) + = ci_status_icon(@ci_commit) %span CI build #{status} for #{@merge_request.last_commit_short_sha}. %span.ci-coverage - = link_to "View build details", ci_status_path(ci_commit) + = link_to "View build details", ci_status_path(@ci_commit) - elsif @merge_request.has_ci? - # Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX |