diff options
| author | Jeff Stubler <brunsa2@gmail.com> | 2015-07-21 04:34:19 +0300 |
|---|---|---|
| committer | Jeff Stubler <brunsa2@gmail.com> | 2015-11-01 20:38:00 +0300 |
| commit | c843722de2d778b6ec8fef0656797fd5a8074666 (patch) | |
| tree | 75040853228588298e29d91b8ce606861f2bb468 /app/views/projects/branches | |
| parent | 8f75200d466d41707f3b1ca12ca4244cfa2e2e7b (diff) | |
Add graphs showing commits ahead and behind default to branches page
Diffstat (limited to 'app/views/projects/branches')
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index cc0ec9483d2..9ddb10a1c74 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -1,4 +1,7 @@ - commit = @repository.commit(branch.target) +- bar_graph_width_factor = @max_commits > 0 ? 100.0/@max_commits : 0 +- number_commits_behind = @repository.diverging_commit_counts(branch)[:behind] +- number_commits_ahead = @repository.diverging_commit_counts(branch)[:ahead] %li(class="js-branch-#{branch.name}") %div = link_to namespace_project_tree_path(@project.namespace, @project, branch.name) do @@ -29,6 +32,17 @@ = link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-grouped btn-xs btn-remove remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do = 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}" } + .graph-side + .bar.bar-behind{ :style => "width: #{number_commits_behind * bar_graph_width_factor}%" } + %span.count.count-behind= number_commits_behind + .graph-separator + .graph-side + .bar.bar-ahead{ :style => "width: #{number_commits_ahead * bar_graph_width_factor}%" } + %span.count.count-ahead= number_commits_ahead + + - if commit = render 'projects/branches/commit', commit: commit, project: @project - else |