diff options
| author | tauriedavis <taurie@gitlab.com> | 2017-05-19 10:50:19 -0700 |
|---|---|---|
| committer | tauriedavis <taurie@gitlab.com> | 2017-05-19 10:50:19 -0700 |
| commit | 77a709442350fab55c593cb99e4929385101bca7 (patch) | |
| tree | 0e041d8fdece5366d9384c4d9008ae43a8f6ec55 | |
| parent | 27eab8a4c32e704946c667ba6eff8bd21ab3ea29 (diff) | |
| download | gitlab-ce-ce#32623-browser-tooltip-commits-branch-list.tar.gz | |
32623 Change order of commits ahead and behind on divergence graph for branch listce#32623-browser-tooltip-commits-branch-list
| -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: |