summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-05-22 07:34:14 +0000
committerPhil Hughes <me@iamphill.com>2019-05-22 07:34:14 +0000
commit1e18cf0b2b945ba9398e88eed210ed4f5f65c309 (patch)
treed2b61215986f2016f7bbd8f2431ab9623942bfbc
parentc342c07899ef6637eef7c1df2534f0c5ea67d7bd (diff)
parenta4954961d98aa82c250686f3e3e6744ea49a91c4 (diff)
downloadgitlab-ce-1e18cf0b2b945ba9398e88eed210ed4f5f65c309.tar.gz
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
-rw-r--r--app/views/admin/users/_form.html.haml6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 296ef073144..0656feb79cb 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/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"