From 8adf6ba8f5bf9086ec3f9bb54ad801deb4d41924 Mon Sep 17 00:00:00 2001 From: "Florent (HP)" Date: Sun, 9 Aug 2015 20:31:50 +0200 Subject: Add merged label on branches page --- app/views/projects/branches/_branch.html.haml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/views/projects/branches/_branch.html.haml') diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 43412624da6..a693c4b282f 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -5,6 +5,11 @@ %strong.str-truncated= branch.name - if branch.name == @repository.root_ref %span.label.label-info default + - elsif @repository.merged_to_root_ref? branch.name + %span.label.label-primary.has_tooltip(title="Merged into #{@repository.root_ref}") + %i.fa.fa-check + merged + - if @project.protected_branch? branch.name %span.label.label-success %i.fa.fa-lock -- cgit v1.2.3