diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 22:34:27 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-02 14:21:31 +0300 |
| commit | c4abaf416cbd3623ddfa12bba9a09e201f9749b1 (patch) | |
| tree | eaf44b53f73a3469643563e7c3cf36ae23713220 | |
| parent | cf6ce9ae5da4e29c3de59fdc0e214312a8af755d (diff) | |
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 8be124f387a..5bc5c71283e 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 |