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

Resolve CE/EE diffs in admin users form

Closes gitlab-ee#10508

See merge request gitlab-org/gitlab-ce!28520

app/views/admin/users/_form.html.haml

@@ -48,6 +48,10 @@
     = render partial: 'access_levels', locals: { f: f }
+    = render_if_exists 'admin/users/namespace_plan_fieldset', f: f
+
+    = render_if_exists 'admin/users/limits', f: f
+
     %fieldset
       %legend Profile
       .form-group.row
@@ -73,6 +77,8 @@
           = f.label :website_url, 'Website', class: 'col-form-label'
         .col-sm-10= f.text_field :website_url, class: 'form-control'
+    = render_if_exists 'admin/users/admin_notes', f: f
+
     .form-actions
       - if @user.new_record?
         = f.submit 'Create user', class: "btn btn-success"