summaryrefslogtreecommitdiff
path: root/app/views/groups/settings
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-11 12:07:18 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-11 12:07:18 +0000
commitfc0afaf7da2156e91e615662272811eee56d034a (patch)
treec6199a554acff7bdd34a7b6d7edf673807062212 /app/views/groups/settings
parente6b6fb602889e43e7a8dde760e01d0a3b2147c54 (diff)
downloadgitlab-ce-fc0afaf7da2156e91e615662272811eee56d034a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups/settings')
-rw-r--r--app/views/groups/settings/repository/show.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/groups/settings/repository/show.html.haml b/app/views/groups/settings/repository/show.html.haml
index a15652b3179..c6bf2d66683 100644
--- a/app/views/groups/settings/repository/show.html.haml
+++ b/app/views/groups/settings/repository/show.html.haml
@@ -8,5 +8,7 @@
= render "shared/deploy_tokens/index", group_or_project: @group, description: deploy_token_description
= render "default_branch", group: @group
+= render_if_exists "protected_branches/protected_branches", protected_branch_entity: @group
+
- if can?(current_user, :change_push_rules, @group)
= render "push_rules"