diff options
| author | Florent (HP) <baldinof@gmail.com> | 2015-08-09 21:31:50 +0300 |
|---|---|---|
| committer | Florent (HP) <baldinof@gmail.com> | 2015-08-12 00:00:46 +0300 |
| commit | 8adf6ba8f5bf9086ec3f9bb54ad801deb4d41924 (patch) | |
| tree | 30ecdf365b62f85c0645d10502d55e05047f6548 /app/views/projects/branches/_branch.html.haml | |
| parent | cb6ad67f52c9e849e0f8ca34b2fff47c585bd816 (diff) | |
Add merged label on branches page
Diffstat (limited to 'app/views/projects/branches/_branch.html.haml')
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
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 |