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)
|
2018-05-09 12:01:36 +05:30
|
|
|
- merge_project = merge_request_source_project_for_project(@project)
|
2019-09-30 21:07:59 +05:30
|
|
|
%li{ class: "branch-item js-branch-item js-branch-#{branch.name}", data: { name: branch.name } }
|
2018-05-09 12:01:36 +05:30
|
|
|
.branch-info
|
|
|
|
.branch-title
|
2021-10-27 15:23:28 +05:30
|
|
|
= sprite_icon('branch', size: 12, css_class: 'gl-flex-shrink-0')
|
2020-06-23 00:09:42 +05:30
|
|
|
= link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name gl-ml-3 qa-branch-name' do
|
2018-05-09 12:01:36 +05:30
|
|
|
= branch.name
|
|
|
|
- if branch.name == @repository.root_ref
|
2021-03-11 19:13:27 +05:30
|
|
|
%span.badge.gl-badge.sm.badge-pill.badge-primary.gl-ml-2 default
|
2018-05-09 12:01:36 +05:30
|
|
|
- elsif merged
|
2021-03-11 19:13:27 +05:30
|
|
|
%span.badge.gl-badge.sm.badge-pill.badge-info.has-tooltip.gl-ml-2{ 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)
|
2021-03-11 19:13:27 +05:30
|
|
|
%span.badge.gl-badge.sm.badge-pill.badge-success.gl-ml-2
|
2018-05-09 12:01:36 +05:30
|
|
|
= s_('Branches|protected')
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2019-09-04 21:01:54 +05:30
|
|
|
= render_if_exists 'projects/branches/diverged_from_upstream', branch: branch
|
|
|
|
|
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-09-30 21:07:59 +05:30
|
|
|
.js-branch-divergence-graph
|
2016-09-29 09:46:39 +05:30
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
.controls.d-none.d-md-block<
|
2020-06-23 00:09:42 +05:30
|
|
|
- if commit_status
|
|
|
|
= render 'ci/status/icon', size: 24, status: commit_status, option_css_classes: 'gl-display-inline-flex gl-vertical-align-middle gl-mr-5'
|
|
|
|
- elsif show_commit_status
|
|
|
|
.gl-display-inline-flex.gl-vertical-align-middle.gl-mr-5
|
|
|
|
%svg.s24
|
|
|
|
|
2021-04-17 20:07:23 +05:30
|
|
|
- if merge_project && create_mr_button?(from: @repository.root_ref, to: branch.name, source_project: @project, target_project: @project)
|
|
|
|
= link_to create_mr_path(from: @repository.root_ref, to: branch.name, source_project: @project, target_project: @project), class: 'gl-button btn btn-default' do
|
2018-05-09 12:01:36 +05:30
|
|
|
= _('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-12-21 20:55:43 +05:30
|
|
|
= link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name),
|
2021-01-29 00:20:46 +05:30
|
|
|
class: "gl-button btn btn-default js-onboarding-compare-branches #{'gl-ml-3' unless merge_project}",
|
2019-12-21 20:55:43 +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
|
|
|
|
2021-09-04 01:27:46 +05:30
|
|
|
= render 'projects/buttons/download', project: @project, ref: branch.name, pipeline: @refs_pipelines[branch.name], class: 'gl-vertical-align-top'
|
2016-01-14 18:37:52 +05:30
|
|
|
|
2021-09-04 01:27:46 +05:30
|
|
|
- if Feature.enabled?(:delete_branch_confirmation_modals, @project, default_enabled: :yaml)
|
|
|
|
= render 'projects/branches/delete_branch_modal_button', project: @project, branch: branch, merged: merged
|
|
|
|
|
|
|
|
- elsif can?(current_user, :push_code, @project)
|
2018-05-09 12:01:36 +05:30
|
|
|
- if branch.name == @project.repository.root_ref
|
2021-03-11 19:13:27 +05:30
|
|
|
- delete_default_branch_tooltip = s_('Branches|The default branch cannot be deleted')
|
2021-09-04 01:27:46 +05:30
|
|
|
%span.gl-display-inline-block.has-tooltip{ title: delete_default_branch_tooltip }
|
|
|
|
%button{ class: 'gl-button btn btn-default btn-icon disabled', disabled: true, 'aria-label' => delete_default_branch_tooltip }
|
|
|
|
= sprite_icon('remove', css_class: 'gl-button-icon gl-icon')
|
2018-05-09 12:01:36 +05:30
|
|
|
- elsif protected_branch?(@project, branch)
|
|
|
|
- if can?(current_user, :push_to_delete_protected_branch, @project)
|
2021-09-04 01:27:46 +05:30
|
|
|
- delete_protected_branch_tooltip = s_('Branches|Delete protected branch')
|
|
|
|
%button{ class: 'gl-button btn btn-default btn-icon has-tooltip',
|
|
|
|
title: delete_protected_branch_tooltip,
|
|
|
|
'aria-label' => delete_protected_branch_tooltip,
|
|
|
|
data: { toggle: 'modal',
|
|
|
|
target: '#modal-delete-branch',
|
2018-05-09 12:01:36 +05:30
|
|
|
delete_path: project_branch_path(@project, branch.name),
|
|
|
|
branch_name: branch.name,
|
2021-09-04 01:27:46 +05:30
|
|
|
is_merged: ('true' if merged) } }
|
|
|
|
= sprite_icon('remove', css_class: 'gl-button-icon gl-icon')
|
2018-05-09 12:01:36 +05:30
|
|
|
- else
|
2021-09-04 01:27:46 +05:30
|
|
|
- delete_protected_branch_disabled_tooltip = s_('Branches|Only a project maintainer or owner can delete a protected branch')
|
|
|
|
%span.has-tooltip{ title: delete_protected_branch_disabled_tooltip }
|
|
|
|
%button{ class: 'gl-button btn btn-default btn-icon disabled', disabled: true, 'aria-label' => delete_protected_branch_disabled_tooltip, data: { testid: 'remove-protected-branch' } }
|
|
|
|
= sprite_icon('remove', css_class: 'gl-button-icon gl-icon')
|
2018-05-09 12:01:36 +05:30
|
|
|
- else
|
|
|
|
= link_to project_branch_path(@project, branch.name),
|
2021-09-04 01:27:46 +05:30
|
|
|
class: 'gl-button btn btn-default btn-icon js-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
|
2021-09-04 01:27:46 +05:30
|
|
|
= sprite_icon('remove', css_class: 'gl-button-icon gl-icon')
|