diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-12 15:16:40 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-12 15:16:40 +0300 |
| commit | d36b6a70829ab15e61da34cdb30b882c92caad32 (patch) | |
| tree | 83b3471bd34dce05f63056bc71e3ba5284d774f0 /app | |
| parent | 650372eb0f1883167e26bbd1f02543b7a2d27e27 (diff) | |
| parent | 0feda3aa60403d7f96b4b421ba2141ae76f11899 (diff) | |
Merge branch '5615-non-admins-only-archieve-ce' into 'master'
Add EE backport for the admin view
See merge request gitlab-org/gitlab-ce!29268
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/application_settings/_visibility_and_access.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_visibility_and_access.html.haml b/app/views/admin/application_settings/_visibility_and_access.html.haml index 03ef2924617..c07bafbe302 100644 --- a/app/views/admin/application_settings/_visibility_and_access.html.haml +++ b/app/views/admin/application_settings/_visibility_and_access.html.haml @@ -8,6 +8,7 @@ .form-group = f.label s_('ProjectCreationLevel|Default project creation protection'), class: 'label-bold' = f.select :default_project_creation, options_for_select(Gitlab::Access.project_creation_options, @application_setting.default_project_creation), {}, class: 'form-control' + = render_if_exists 'admin/application_settings/default_project_deletion_protection_setting', form: f .form-group.visibility-level-setting = f.label :default_project_visibility, class: 'label-bold' = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new) |