diff options
| author | ZJ van de Weg <zegerjan@gitlab.com> | 2016-05-25 14:41:25 +0200 |
|---|---|---|
| committer | ZJ van de Weg <zegerjan@gitlab.com> | 2016-05-25 14:41:25 +0200 |
| commit | 7ae536002ac981b3d18aae8851d8d70731db29dc (patch) | |
| tree | 5d0c660df87be8d8d7ac4c50bab9ce1c27cbd876 /app/views/projects/merge_requests/_merge_request.html.haml | |
| parent | 20e6e0dbe609f7b0fdd480281223a1a98d645f34 (diff) | |
| parent | 318b22459bfff1cecfb1f38e381faaca3bc29bbb (diff) | |
| download | gitlab-ce-7ae536002ac981b3d18aae8851d8d70731db29dc.tar.gz | |
Merge branch 'master' into awardables
Diffstat (limited to 'app/views/projects/merge_requests/_merge_request.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index bcc6c4f2d5f..8edeb120ba5 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -13,7 +13,7 @@ - if merge_request.ci_commit %li - = render_ci_status(merge_request.ci_commit) + = render_pipeline_status(merge_request.ci_commit) - if merge_request.open? && merge_request.broken? %li |