kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ce#32623-browser-tooltip-commits-branch-list' into 'master'

Browse source 
32623 Change order of commits ahead and behind on divergence graph for branch list

Closes #32623

See merge request !11559
This commit is contained in:
Annabel Dunstone Gray 2017-05-22 18:36:43 +00:00
commit d089a1d215
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/branches/_branch.html.haml
View file

@ -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

5
changelogs/unreleased/ce-32623-browser-tooltip-commits-branch-list.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Change order of commits ahead and behind on divergence graph for branch list
view
merge_request:
author: