diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-18 15:28:02 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-18 15:28:02 +0000 |
| commit | cad4eb989e87c2e1ce996cfb5817d2c1729111c8 (patch) | |
| tree | c22d766e5f9dd8a299a3d68cd70f8a04df7e754a /app/views/projects/branches | |
| parent | 02579d6aeba3673c950896bdb511df8c678e20ca (diff) | |
| parent | d8dd75ca775f66fd756e43ddd73ac75d39fc3e64 (diff) | |
| download | gitlab-ce-cad4eb989e87c2e1ce996cfb5817d2c1729111c8.tar.gz | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/projects/issues/_nav_btns.html.haml
# app/views/projects/merge_requests/creations/_new_compare.html.haml
Diffstat (limited to 'app/views/projects/branches')
| -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 8077a559a99..54767bdf757 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -29,7 +29,7 @@ = s_('Branches|Cant find HEAD commit for this branch') - if branch.name != @repository.root_ref - .divergence-graph{ title: s_('%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead') % { number_commits_behind: diverging_count_label(number_commits_behind), + .divergence-graph.hidden-xs{ title: s_('%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead') % { number_commits_behind: diverging_count_label(number_commits_behind), default_branch: @repository.root_ref, number_commits_ahead: diverging_count_label(number_commits_ahead) } } .graph-side |