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

Resolve CE/EE diffs in group general settings

Closes #11027

See merge request gitlab-org/gitlab-ee!12793

app/views/groups/settings/_general.html.haml

@@ -17,7 +17,7 @@
         = f.label :description, _('Group description (optional)'), class: 'label-bold'
         = f.text_area :description, class: 'form-control', rows: 3, maxlength: 250
 
-  .row= render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group
+  = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group
 
   .form-group.prepend-top-default.append-bottom-20
     .avatar-container.rect-avatar.s90

app/views/projects/settings/_general.html.haml

@@ -27,7 +27,7 @@
 
   .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
     .avatar-container.s90

ee/app/views/shared/_repository_size_limit_setting.html.haml

@@ -3,9 +3,10 @@
 - form = local_assigns.fetch(:form)
 - is_project = local_assigns.fetch(:type) == :project
 
-.form-group.col-md-9
-  = form.label :repository_size_limit, class: 'label-bold' do
-    Repository size limit (MB)
-  = form.number_field :repository_size_limit, value: form.object.repository_size_limit.try(:to_mb), class: 'form-control', min: 0
-  %span.form-text.text-muted#repository_size_limit_help_block
-    = is_project ? size_limit_message(@project) : size_limit_message_for_group(@group)
+.row
+  .form-group.col-md-9
+    = form.label :repository_size_limit, class: 'label-bold' do
+      Repository size limit (MB)
+    = form.number_field :repository_size_limit, value: form.object.repository_size_limit.try(:to_mb), class: 'form-control', min: 0
+    %span.form-text.text-muted#repository_size_limit_help_block
+      = is_project ? size_limit_message(@project) : size_limit_message_for_group(@group)