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

Merge branch 'generic-commit-status' into 'master'
8bb8dd39 · Jacob Schatz · 891c9485 · d3c5650e · 8bb8dd39
Commit 8bb8dd39 authored May 25, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

_generic_commit_status.html.haml .../generic_commit_statuses/_generic_commit_status.html.haml +7 -7

No files found.
--- 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
+  %td
-      - if generic_commit_status.tags.any?
+    - if generic_commit_status.tags.any?
-        - generic_commit_status.tags.each do |tag|
+      - generic_commit_status.tags.each do |tag|
-          %span.label.label-primary
+        %span.label.label-primary
-            = tag
+          = tag
-      - if defined?(retried) && retried
+    - if defined?(retried) && retried
-        %span.label.label-warning retried
+      %span.label.label-warning retried
  %td.duration
    - if generic_commit_status.duration