2018-03-17 18:26:18 +05:30
|
|
|
- merged = local_assigns.fetch(:merged, false)
|
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]
|
2018-05-09 12:01:36 +05:30
|
|
|
- merge_project = merge_request_source_project_for_project(@project)
|
|
|
|
%li{ class: "branch-item js-branch-#{branch.name}" }
|
|
|
|
.branch-info
|
|
|
|
.branch-title
|
2018-10-15 14:42:47 +05:30
|
|
|
= sprite_icon('fork', size: 12)
|
|
|
|
= link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name prepend-left-8' do
|
2018-05-09 12:01:36 +05:30
|
|
|
= branch.name
|
|
|
|
- if branch.name == @repository.root_ref
|
2018-11-08 19:23:39 +05:30
|
|
|
%span.badge.badge-primary.prepend-left-5 default
|
2018-05-09 12:01:36 +05:30
|
|
|
- elsif merged
|
2018-11-08 19:23:39 +05:30
|
|
|
%span.badge.badge-info.has-tooltip.prepend-left-5{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } }
|
2018-05-09 12:01:36 +05:30
|
|
|
= s_('Branches|merged')
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2018-05-09 12:01:36 +05:30
|
|
|
- if protected_branch?(@project, branch)
|
2018-11-08 19:23:39 +05:30
|
|
|
%span.badge.badge-success.prepend-left-5
|
2018-05-09 12:01:36 +05:30
|
|
|
= s_('Branches|protected')
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2018-05-09 12:01:36 +05:30
|
|
|
.block-truncated
|
|
|
|
- if commit
|
|
|
|
= render 'projects/branches/commit', commit: commit, project: @project
|
|
|
|
- else
|
|
|
|
= s_('Branches|Cant find HEAD commit for this branch')
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2018-05-09 12:01:36 +05:30
|
|
|
- if branch.name != @repository.root_ref
|
2019-05-30 16:15:17 +05:30
|
|
|
.divergence-graph.d-none.d-md-block{ title: s_('%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead') % { number_commits_behind: diverging_count_label(number_commits_behind),
|
|
|
|
default_branch: @repository.root_ref,
|
|
|
|
number_commits_ahead: diverging_count_label(number_commits_ahead) } }
|
|
|
|
.graph-side
|
|
|
|
.bar.bar-behind{ style: "width: #{number_commits_behind * bar_graph_width_factor}%" }
|
|
|
|
%span.count.count-behind= diverging_count_label(number_commits_behind)
|
|
|
|
.graph-separator
|
|
|
|
.graph-side
|
|
|
|
.bar.bar-ahead{ style: "width: #{number_commits_ahead * bar_graph_width_factor}%" }
|
|
|
|
%span.count.count-ahead= diverging_count_label(number_commits_ahead)
|
2016-09-29 09:46:39 +05:30
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
.controls.d-none.d-md-block<
|
2018-05-09 12:01:36 +05:30
|
|
|
- if merge_project && create_mr_button?(@repository.root_ref, branch.name)
|
|
|
|
= link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do
|
|
|
|
= _('Merge request')
|
2014-09-02 18:07:02 +05:30
|
|
|
|
2016-01-14 18:37:52 +05:30
|
|
|
- if branch.name != @repository.root_ref
|
2019-05-30 16:15:17 +05:30
|
|
|
= link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name),
|
2018-05-09 12:01:36 +05:30
|
|
|
class: "btn btn-default #{'prepend-left-10' unless merge_project}",
|
2019-05-30 16:15:17 +05:30
|
|
|
method: :post,
|
2018-05-09 12:01:36 +05:30
|
|
|
title: s_('Branches|Compare') do
|
|
|
|
= s_('Branches|Compare')
|
2016-01-14 18:37:52 +05:30
|
|
|
|
2018-05-09 12:01:36 +05:30
|
|
|
= render 'projects/buttons/download', project: @project, ref: branch.name, pipeline: @refs_pipelines[branch.name]
|
2016-01-14 18:37:52 +05:30
|
|
|
|
2018-05-09 12:01:36 +05:30
|
|
|
- if can?(current_user, :push_code, @project)
|
|
|
|
- if branch.name == @project.repository.root_ref
|
|
|
|
%button{ class: "btn btn-remove remove-row js-ajax-loading-spinner has-tooltip disabled",
|
|
|
|
disabled: true,
|
|
|
|
title: s_('Branches|The default branch cannot be deleted') }
|
|
|
|
= icon("trash-o")
|
|
|
|
- elsif protected_branch?(@project, branch)
|
|
|
|
- if can?(current_user, :push_to_delete_protected_branch, @project)
|
|
|
|
%button{ class: "btn btn-remove remove-row js-ajax-loading-spinner has-tooltip",
|
|
|
|
title: s_('Branches|Delete protected branch'),
|
|
|
|
data: { toggle: "modal",
|
|
|
|
target: "#modal-delete-branch",
|
|
|
|
delete_path: project_branch_path(@project, branch.name),
|
|
|
|
branch_name: branch.name,
|
|
|
|
is_merged: ("true" if merged) } }
|
|
|
|
= icon("trash-o")
|
|
|
|
- else
|
|
|
|
%button{ class: "btn btn-remove remove-row js-ajax-loading-spinner has-tooltip disabled",
|
|
|
|
disabled: true,
|
2018-11-08 19:23:39 +05:30
|
|
|
title: s_('Branches|Only a project maintainer or owner can delete a protected branch') }
|
2018-05-09 12:01:36 +05:30
|
|
|
= icon("trash-o")
|
|
|
|
- else
|
|
|
|
= link_to project_branch_path(@project, branch.name),
|
2019-03-02 22:35:43 +05:30
|
|
|
class: "btn btn-remove remove-row qa-remove-btn js-ajax-loading-spinner has-tooltip",
|
2018-05-09 12:01:36 +05:30
|
|
|
title: s_('Branches|Delete branch'),
|
|
|
|
method: :delete,
|
|
|
|
data: { confirm: s_("Branches|Deleting the '%{branch_name}' branch cannot be undone. Are you sure?") % { branch_name: branch.name } },
|
|
|
|
remote: true,
|
|
|
|
'aria-label' => s_('Branches|Delete branch') do
|
|
|
|
= icon("trash-o")
|