-
-
{{ name }}
+
+
+
+
{{ name }}
-
{{
- $options.i18n.defaultLabel
- }}
+
{{
+ $options.i18n.defaultLabel
+ }}
-
{{
- $options.i18n.protectedLabel
- }}
+
{{
+ $options.i18n.protectedLabel
+ }}
-
+
+
+
+ {{ $options.i18n.detailsButtonLabel }}
-
- {{ $options.i18n.detailsButtonLabel }}
-
+
diff --git a/app/views/projects/branch_rules/_show.html.haml b/app/views/projects/branch_rules/_show.html.haml
index 605715e2899aa42c281bdc72d0577a16ce0e27b3..ed7561122c07f437661c0eafba34cedeb3d54e77 100644
--- a/app/views/projects/branch_rules/_show.html.haml
+++ b/app/views/projects/branch_rules/_show.html.haml
@@ -12,5 +12,5 @@
= _('Define rules for who can push, merge, and the required approvals for each branch.')
= link_to(_('Leave feedback.'), 'https://gitlab.com/gitlab-org/gitlab/-/issues/388149', target: '_blank', rel: 'noopener noreferrer')
- .settings-content.gl-pr-0
+ .settings-content
#js-branch-rules{ data: { project_path: @project.full_path, branch_rules_path: project_settings_repository_branch_rules_path(@project), show_code_owners: show_code_owners.to_s, show_status_checks: show_status_checks.to_s, show_approvers: show_approvers.to_s } }
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 80ff5f27fabf417ab33db5f0765d32f94fa5f5da..0297a09eb8b434ff0699d5a1829d134d84e99788 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8133,6 +8133,9 @@ msgstr ""
msgid "Branch %{branch_name} was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}"
msgstr ""
+msgid "Branch Rules"
+msgstr ""
+
msgid "Branch already exists"
msgstr ""
@@ -8238,9 +8241,6 @@ msgstr ""
msgid "BranchRules|Create wildcard: %{searchTerm}"
msgstr ""
-msgid "BranchRules|Details"
-msgstr ""
-
msgid "BranchRules|Does not allow force push"
msgstr ""
@@ -8310,6 +8310,9 @@ msgstr ""
msgid "BranchRules|Users"
msgstr ""
+msgid "BranchRules|View details"
+msgstr ""
+
msgid "BranchRules|default"
msgstr ""