diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-22 18:36:43 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-22 18:36:43 +0000 |
| commit | d089a1d21543029d83404de7433cb90640a6054d (patch) | |
| tree | 6c29892e571918252a66a1ead4ea0be9e9d3e8df | |
| parent | 6cc8a376bb8b7b9712544f13881e12d1b026ceda (diff) | |
| parent | 77a709442350fab55c593cb99e4929385101bca7 (diff) | |
| download | gitlab-ce-d089a1d21543029d83404de7433cb90640a6054d.tar.gz | |
Merge branch 'ce#32623-browser-tooltip-commits-branch-list' into 'master'
32623 Change order of commits ahead and behind on divergence graph for branch list
Closes #32623
See merge request !11559
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/ce-32623-browser-tooltip-commits-branch-list.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 304c512e1b5..869633e016d 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -61,7 +61,7 @@ = icon("trash-o") - if branch.name != @repository.root_ref - .divergence-graph{ title: "#{number_commits_ahead} commits ahead, #{number_commits_behind} commits behind #{@repository.root_ref}" } + .divergence-graph{ title: "#{number_commits_behind} commits behind #{@repository.root_ref}, #{number_commits_ahead} commits ahead" } .graph-side .bar.bar-behind{ style: "width: #{number_commits_behind * bar_graph_width_factor}%" } %span.count.count-behind= number_commits_behind diff --git a/changelogs/unreleased/ce-32623-browser-tooltip-commits-branch-list.yml b/changelogs/unreleased/ce-32623-browser-tooltip-commits-branch-list.yml new file mode 100644 index 00000000000..93edafed699 --- /dev/null +++ b/changelogs/unreleased/ce-32623-browser-tooltip-commits-branch-list.yml @@ -0,0 +1,5 @@ +--- +title: Change order of commits ahead and behind on divergence graph for branch list + view +merge_request: +author: |