diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-09 06:07:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-09 06:07:46 +0300 |
| commit | 38ff3a81189c8323d323946afcf7dad62c84b9aa (patch) | |
| tree | f5763c753d647f63ec06daea3f83f2e0e6d5be4d /app/views | |
| parent | c46d8e7601c032d954c9f35761ae14dc4bacf6ce (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/protected_branches/shared/_protected_branch.html.haml | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/app/views/protected_branches/shared/_protected_branch.html.haml b/app/views/protected_branches/shared/_protected_branch.html.haml index b4fd7a24b41..c2a5dd8a9b0 100644 --- a/app/views/protected_branches/shared/_protected_branch.html.haml +++ b/app/views/protected_branches/shared/_protected_branch.html.haml @@ -1,14 +1,15 @@ - can_admin_entity = protected_branch_can_admin_entity?(protected_branch_entity) - url = protected_branch_path_by_entity(protected_branch, protected_branch_entity) +- protected_branch_test_type = protected_branch.project_level? ? 'project-level' : 'group-level' -%tr.js-protected-branch-edit-form{ data: { url: url, testid: 'protected-branch' } } +%tr.js-protected-branch-edit-form{ data: { url: url, testid: 'protected-branch', test_type: protected_branch_test_type } } %td %span.ref-name= protected_branch.name - - if protected_branch_entity.is_a?(Project) && protected_branch_entity.root_ref?(protected_branch.name) - = gl_badge_tag s_('ProtectedBranch|default'), variant: :info + - if protected_branch.project_level? + - if protected_branch_entity.root_ref?(protected_branch.name) + = gl_badge_tag s_('ProtectedBranch|default'), variant: :info - - if protected_branch_entity.is_a?(Project) %div - if protected_branch.wildcard? - matching_branches = protected_branch.matching(repository.branch_names) @@ -18,8 +19,12 @@ = yield - = render_if_exists 'protected_branches/ee/code_owner_approval_table', protected_branch: protected_branch, protected_branch_entity: protected_branch_entity + = render_if_exists 'protected_branches/ee/code_owner_approval_table', can_update: local_assigns[:can_update], protected_branch: protected_branch, protected_branch_entity: protected_branch_entity - if can_admin_entity - %td - = link_to s_('ProtectedBranch|Unprotect'), [protected_branch_entity, protected_branch, { update_section: 'js-protected-branches-settings' }], disabled: local_assigns[:disabled], aria: { label: s_('ProtectedBranch|Unprotect branch') }, data: { confirm: s_('ProtectedBranch|Branch will be writable for developers. Are you sure?'), confirm_btn_variant: 'danger' }, method: :delete, class: "btn gl-button btn-danger btn-sm" + %td.text-right{ data: { testid: 'protected-branch-action' } } + - if local_assigns[:is_inherited] + %span.has-tooltip{ data: { container: 'body' }, title: s_('ProtectedBranch|Inherited - This setting can be changed at the group level'), 'aria-hidden': 'true' } + = sprite_icon 'lock' + - else + = link_to s_('ProtectedBranch|Unprotect'), [protected_branch_entity, protected_branch, { update_section: 'js-protected-branches-settings' }], disabled: local_assigns[:disabled], aria: { label: s_('ProtectedBranch|Unprotect branch') }, data: { confirm: s_('ProtectedBranch|Branch will be writable for developers. Are you sure?'), confirm_btn_variant: 'danger' }, method: :delete, class: "btn gl-button btn-danger btn-sm" |