diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:07:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:07:57 +0300 |
| commit | 988b28ec1a379d38f6ac9ed04886ee564fd447fd (patch) | |
| tree | 9d93267209387e62d23ea7abf81ef9c0d64f2f0b /app/views/groups | |
| parent | a325f3a104748ecc68df7c3d793940aa709a111f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/settings/_permissions.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/groups/settings/_permissions.html.haml b/app/views/groups/settings/_permissions.html.haml index 618cfe57be4..016a9c8e054 100644 --- a/app/views/groups/settings/_permissions.html.haml +++ b/app/views/groups/settings/_permissions.html.haml @@ -33,6 +33,7 @@ = render_if_exists 'groups/settings/ip_restriction', f: f, group: @group = render_if_exists 'groups/settings/allowed_email_domain', f: f, group: @group = render 'groups/settings/lfs', f: f + = render 'shared/default_branch_protection', f: f, selected_level: @group.default_branch_protection = render 'groups/settings/project_creation_level', f: f, group: @group = render 'groups/settings/subgroup_creation_level', f: f, group: @group = render 'groups/settings/two_factor_auth', f: f |