2016-11-24 13:41:30 +05:30
|
|
|
- commit = @repository.commit(branch.dereferenced_target)
|
2016-01-14 18:37:52 +05:30
|
|
|
- bar_graph_width_factor = @max_commits > 0 ? 100.0/@max_commits : 0
|
2016-01-19 16:12:03 +05:30
|
|
|
- diverging_commit_counts = @repository.diverging_commit_counts(branch)
|
2016-01-14 18:37:52 +05:30
|
|
|
- number_commits_behind = diverging_commit_counts[:behind]
|
|
|
|
- number_commits_ahead = diverging_commit_counts[:ahead]
|
2016-09-29 09:46:39 +05:30
|
|
|
- merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
|
2014-09-02 18:07:02 +05:30
|
|
|
%li(class="js-branch-#{branch.name}")
|
2015-09-25 12:07:36 +05:30
|
|
|
%div
|
2016-09-29 09:46:39 +05:30
|
|
|
= link_to namespace_project_tree_path(@project.namespace, @project, branch.name), class: 'item-title str-truncated' do
|
|
|
|
= branch.name
|
2015-12-23 02:04:40 +05:30
|
|
|
|
|
|
|
- if branch.name == @repository.root_ref
|
|
|
|
%span.label.label-primary default
|
|
|
|
- elsif @repository.merged_to_root_ref? branch.name
|
2016-06-02 11:05:42 +05:30
|
|
|
%span.label.label-info.has-tooltip(title="Merged into #{@repository.root_ref}")
|
2015-12-23 02:04:40 +05:30
|
|
|
merged
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2015-12-23 02:04:40 +05:30
|
|
|
- if @project.protected_branch? branch.name
|
|
|
|
%span.label.label-success
|
|
|
|
%i.fa.fa-lock
|
|
|
|
protected
|
2015-09-25 12:07:36 +05:30
|
|
|
.controls.hidden-xs
|
2016-09-29 09:46:39 +05:30
|
|
|
- if merge_project && create_mr_button?(@repository.root_ref, branch.name)
|
2016-06-22 15:30:34 +05:30
|
|
|
= link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do
|
2015-09-11 14:41:01 +05:30
|
|
|
Merge Request
|
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
- if branch.name != @repository.root_ref
|
2016-09-29 09:46:39 +05:30
|
|
|
= link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: branch.name), class: "btn btn-default #{'prepend-left-10' unless merge_project}", method: :post, title: "Compare" do
|
2014-09-02 18:07:02 +05:30
|
|
|
Compare
|
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
= render 'projects/buttons/download', project: @project, ref: branch.name
|
|
|
|
|
2016-11-03 12:29:30 +05:30
|
|
|
- if can?(current_user, :push_code, @project)
|
|
|
|
= link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: "btn btn-remove remove-row has-tooltip #{can_remove_branch?(@project, branch.name) ? '' : 'disabled'}", title: "Delete branch", method: :delete, data: { confirm: "Deleting the '#{branch.name}' branch cannot be undone. Are you sure?", container: 'body' }, remote: true do
|
2015-09-11 14:41:01 +05:30
|
|
|
= icon("trash-o")
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2016-01-14 18:37:52 +05:30
|
|
|
- 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
|
|
|
|
|
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
- if commit
|
2015-09-25 12:07:36 +05:30
|
|
|
= render 'projects/branches/commit', commit: commit, project: @project
|
2014-09-02 18:07:02 +05:30
|
|
|
- else
|
|
|
|
%p
|
|
|
|
Cant find HEAD commit for this branch
|