Commit bf68a923 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch 'yo-gl-badge-protected-branch' into 'master'

Apply new GitLab UI for badge and button in project's protected branch settings

See merge request gitlab-org/gitlab!52207
parents 87abe64d 83c6a6ca
......@@ -5,7 +5,7 @@
%span.ref-name= protected_branch.name
- if @project.root_ref?(protected_branch.name)
%span.badge.badge-info.d-inline default
%span.badge.gl-badge.badge-pill.badge-info.d-inline default
%div
- if protected_branch.wildcard?
......@@ -20,4 +20,4 @@
- if can_admin_project
%td
= link_to 'Unprotect', [@project, protected_branch, { update_section: 'js-protected-branches-settings' }], disabled: local_assigns[:disabled], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-warning"
= link_to 'Unprotect', [@project, protected_branch, { update_section: 'js-protected-branches-settings' }], disabled: local_assigns[:disabled], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn gl-button btn-warning"
---
title: Apply new GitLab UI for badge and button in project's protected branch settings
merge_request: 52207
author: Yogi (@yo)
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment