Commit 59db4e31 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'group-general-settings-scb' into 'master'

Resolve CE/EE diffs in group general settings

See merge request gitlab-org/gitlab-ce!28363
parents 34bee62d 887df689
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
.row= render_if_exists 'projects/classification_policy_settings', f: f .row= render_if_exists 'projects/classification_policy_settings', f: f
.row= render_if_exists 'shared/repository_size_limit_setting', form: f, type: :project = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :project
.form-group.prepend-top-default.append-bottom-20 .form-group.prepend-top-default.append-bottom-20
.avatar-container.s90 .avatar-container.s90
......
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