Commit 55594323 authored by Phil Hughes's avatar Phil Hughes

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

Resolve CE/EE diffs in admin users form

Closes #10508

See merge request gitlab-org/gitlab-ee!13039
parents 670956b2 910cb046
......@@ -48,13 +48,9 @@
= render partial: 'access_levels', locals: { f: f }
- if Gitlab::CurrentSettings.should_check_namespace_plan?
= f.fields_for :namespace do |namespace_form|
%fieldset
%legend Licensed Features
= render 'admin/namespace_plan', f: namespace_form
= render_if_exists 'admin/users/namespace_plan_fieldset', f: f
= render partial: 'limits', locals: { f: f }
= render_if_exists 'admin/users/limits', f: f
%fieldset
%legend Profile
......@@ -81,11 +77,7 @@
= f.label :website_url, 'Website', class: 'col-form-label'
.col-sm-10= f.text_field :website_url, class: 'form-control'
%fieldset
%legend Admin notes
.form-group.row
= f.label :note, 'Note', class: 'col-form-label'
.col-sm-10= f.text_area :note, class: 'form-control'
= render_if_exists 'admin/users/admin_notes', f: f
.form-actions
- if @user.new_record?
......
%fieldset
%legend= _('Admin notes')
.form-group.row
= f.label :note, _('AdminNote|Note'), class: 'col-form-label'
.col-sm-10= f.text_area :note, class: 'form-control'
- if Gitlab::CurrentSettings.should_check_namespace_plan?
= f.fields_for :namespace do |namespace_form|
%fieldset
%legend= _('Licensed Features')
= render 'admin/namespace_plan', f: namespace_form
......@@ -753,6 +753,9 @@ msgstr ""
msgid "Admin Section"
msgstr ""
msgid "Admin notes"
msgstr ""
msgid "AdminArea| You are about to permanently delete the user %{username}. Issues, merge requests, and groups linked to them will be transferred to a system-wide \"Ghost-user\". To avoid data loss, consider using the %{strong_start}block user%{strong_end} feature instead. Once you %{strong_start}Delete user%{strong_end}, it cannot be undone or recovered."
msgstr ""
......@@ -774,6 +777,9 @@ msgstr ""
msgid "AdminArea|You’re about to stop all jobs.This will halt all current jobs that are running."
msgstr ""
msgid "AdminNote|Note"
msgstr ""
msgid "AdminProjects| You’re about to permanently delete the project %{projectName}, its repository, and all related resources including issues, merge requests, etc.. Once you confirm and press %{strong_start}Delete project%{strong_end}, it cannot be undone or recovered."
msgstr ""
......@@ -7464,6 +7470,9 @@ msgstr ""
msgid "LicenseManagement|You are about to remove the license, %{name}, from this project."
msgstr ""
msgid "Licensed Features"
msgstr ""
msgid "Licensed to"
msgstr ""
......
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