diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-17 22:06:03 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-17 22:06:03 +0000 |
| commit | adcdb25b014fe849fe8003a954484a695fbf78ed (patch) | |
| tree | c15d1b84f0d8c1d7b24ce49f4d02bc965c8f0a5a | |
| parent | 2cc78c0b03d9468e25bbf4805fe1d55e414840ff (diff) | |
| parent | 903f8e45ae24e20d9ecc03deb2de33f7f5bc775d (diff) | |
| download | gitlab-ce-adcdb25b014fe849fe8003a954484a695fbf78ed.tar.gz | |
Merge branch '42543-hide-divergence-graph-on-branches-for-mobile' into 'master'
Remove ahead/behind graphs on project branches on mobile
Closes #42543
See merge request gitlab-org/gitlab-ce!18415
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/42543-hide-divergence-graph-on-branches-for-mobile.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 71176acd12d..d0c01f95cb7 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 diff --git a/changelogs/unreleased/42543-hide-divergence-graph-on-branches-for-mobile.yml b/changelogs/unreleased/42543-hide-divergence-graph-on-branches-for-mobile.yml new file mode 100644 index 00000000000..7452a264bfd --- /dev/null +++ b/changelogs/unreleased/42543-hide-divergence-graph-on-branches-for-mobile.yml @@ -0,0 +1,5 @@ +--- +title: Remove ahead/behind graphs on project branches on mobile +merge_request: 18415 +author: Takuya Noguchi +type: other |