diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-17 08:27:01 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-17 08:27:01 +0000 |
| commit | 34bee62d6f665e2ceba40d2022d0d0a0d906a9e8 (patch) | |
| tree | 8115631dccb48fd93d803609040b10d14f3c06e3 | |
| parent | 5f20f5c3b680fac25a0c1a0b62708152c73364bb (diff) | |
| parent | 20f535c89a47758f5b739a80f477f9abb2169c1d (diff) | |
| download | gitlab-ce-34bee62d6f665e2ceba40d2022d0d0a0d906a9e8.tar.gz | |
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
| -rw-r--r-- | app/views/admin/groups/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 8fb38f6a690..62d1d01cc83 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -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 |