diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-13 14:37:55 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-13 14:37:55 -0500 |
| commit | 1968191c523f1ee45e4f7eac75b435df61b75398 (patch) | |
| tree | a4d8ef2ee6352cd89e0629affef010fd19bc429b /app/views/projects/branches/_branch.html.haml | |
| parent | 5e546f4bc8737319fee2a61a2ce2fc9340e40337 (diff) | |
| download | gitlab-ce-1968191c523f1ee45e4f7eac75b435df61b75398.tar.gz | |
[skip ci] label-info => badge-info
Diffstat (limited to 'app/views/projects/branches/_branch.html.haml')
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 83b26801474..8077a559a99 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -15,7 +15,7 @@ - if branch.name == @repository.root_ref %span.badge.badge-primary default - elsif merged - %span.badge.label-info.has-tooltip{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } } + %span.badge.badge-info.has-tooltip{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } } = s_('Branches|merged') - if protected_branch?(@project, branch) |