Show branches/tags as labels on commit page

1 files changed, 14 insertions, 16 deletions

diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 1d4658432ae..b41fb1437f2 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -37,25 +37,23 @@
   - @commit.parents.each do |parent|
     = link_to parent.short_id, project_commit_path(@project, parent)
 
-- if @branches.any?
-  .commit-info-row
-    %span.cgray
-      Exists in
+.commit-info-row
+  - if @branches.any?
     %span
       - branch = commit_default_branch(@project, @branches)
-      = link_to(branch, project_tree_path(@project, branch))
-      - if @branches.any?
-        and in
-        = link_to("#{pluralize(@branches.count, "other branch")}", "#", class: "js-details-expand")
+      = link_to(project_tree_path(@project, branch)) do
+        %span.label.label-gray
+          %i.fa.fa-code-fork
+          = branch
+      - if @branches.any? || @tags.any?
+        = link_to("#", class: "js-details-expand") do
+          %span.label.label-gray
+            \...
         %span.js-details-content.hide
-          = commit_branches_links(@project, @branches)
-
-- if @tags.any?
-  .commit-info-row
-    %span.cgray
-      Tags: 
-    %span
-      = commit_tags_links(@project, @tags)
+          - if @branches.any?
+            = commit_branches_links(@project, @branches)
+          - if @tags.any?
+            = commit_tags_links(@project, @tags)
 
 .commit-box
   %h3.commit-title