Commit 97aa3650 authored by Martin Wortschack's avatar Martin Wortschack Committed by Natalia Tepluhina

Make badge in shared/_protected_branch partial Pajamas-compliant

parent a75ba536
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
%span.ref-name= protected_branch.name %span.ref-name= protected_branch.name
- if @project.root_ref?(protected_branch.name) - if @project.root_ref?(protected_branch.name)
%span.badge.gl-badge.badge-pill.badge-info.d-inline default = gl_badge_tag s_('ProtectedBranch|default'), variant: :info
%div %div
- if protected_branch.wildcard? - if protected_branch.wildcard?
...@@ -20,4 +20,4 @@ ...@@ -20,4 +20,4 @@
- if can_admin_project - if can_admin_project
%td %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 gl-button btn-warning" = link_to s_('ProtectedBranch|Unprotect'), [@project, protected_branch, { update_section: 'js-protected-branches-settings' }], disabled: local_assigns[:disabled], data: { confirm: s_('ProtectedBranch|Branch will be writable for developers. Are you sure?') }, method: :delete, class: "btn gl-button btn-warning"
...@@ -28519,6 +28519,9 @@ msgstr "" ...@@ -28519,6 +28519,9 @@ msgstr ""
msgid "ProtectedBranch|Branch" msgid "ProtectedBranch|Branch"
msgstr "" msgstr ""
msgid "ProtectedBranch|Branch will be writable for developers. Are you sure?"
msgstr ""
msgid "ProtectedBranch|Branch:" msgid "ProtectedBranch|Branch:"
msgstr "" msgstr ""
...@@ -28564,6 +28567,9 @@ msgstr "" ...@@ -28564,6 +28567,9 @@ msgstr ""
msgid "ProtectedBranch|Toggle code owner approval" msgid "ProtectedBranch|Toggle code owner approval"
msgstr "" msgstr ""
msgid "ProtectedBranch|Unprotect"
msgstr ""
msgid "ProtectedBranch|What are protected branches?" msgid "ProtectedBranch|What are protected branches?"
msgstr "" msgstr ""
......
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