Commit 34bee62d authored by Phil Hughes's avatar Phil Hughes

Merge branch 'admin-groups-form-scb' into 'master'

Resolve CE/EE diffs in admin groups form

Closes gitlab-ee#11042

See merge request gitlab-org/gitlab-ce!28365
parents 5f20f5c3 20f535c8
......@@ -2,7 +2,7 @@
= form_errors(@group)
= render 'shared/group_form', f: f
= render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group
= render_if_exists 'shared/old_repository_size_limit_setting', form: f, type: :group
= render_if_exists 'admin/namespace_plan', f: f
.form-group.row.group-description-holder
......
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