Commit 6510a18c authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch...

Merge branch '344174-replace-data-confirm-modals-with-glmodal-in-app-views-projects-protected_branches-shared' into 'master'

Use `GlModal` in `_protected_branch.html.haml`

See merge request gitlab-org/gitlab!80355
parents ef014c7a e7b44596
...@@ -20,4 +20,4 @@ ...@@ -20,4 +20,4 @@
- if can_admin_project - if can_admin_project
%td %td
= 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" = link_to s_('ProtectedBranch|Unprotect'), [@project, 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-warning"
...@@ -29301,6 +29301,9 @@ msgstr "" ...@@ -29301,6 +29301,9 @@ msgstr ""
msgid "ProtectedBranch|Unprotect" msgid "ProtectedBranch|Unprotect"
msgstr "" msgstr ""
msgid "ProtectedBranch|Unprotect branch"
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