diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 19:34:27 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 19:34:27 +0000 |
| commit | 8bb8dd39d6f148252a9e1dab56dec7d9f0ebe2a5 (patch) | |
| tree | 5002e6711f5372ab0995b422ddcae4b20ac3b4f3 | |
| parent | 891c94852d455000641c9d437398360f635c4e0f (diff) | |
| parent | d3c5650e178f3711cc56cd86e5bb78d4682cc408 (diff) | |
| download | gitlab-ce-8bb8dd39d6f148252a9e1dab56dec7d9f0ebe2a5.tar.gz | |
Merge branch 'generic-commit-status' into 'master'
Move tags to column in generic_commit_status
Part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4249
cc @ayufan
See merge request !4277
| -rw-r--r-- | app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml | 14 |
1 files changed, 7 insertions, 7 deletions
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 8129514964a..5041f0f5c03 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 @@ -40,13 +40,13 @@ %td = generic_commit_status.name - .pull-right - - if generic_commit_status.tags.any? - - generic_commit_status.tags.each do |tag| - %span.label.label-primary - = tag - - if defined?(retried) && retried - %span.label.label-warning retried + %td + - if generic_commit_status.tags.any? + - generic_commit_status.tags.each do |tag| + %span.label.label-primary + = tag + - if defined?(retried) && retried + %span.label.label-warning retried %td.duration - if generic_commit_status.duration |