Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
54ff60f7
Commit
54ff60f7
authored
Feb 06, 2017
by
Timothy Andrew
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport UI changes from gitlab-org/gitlab-ee!998
parent
2e0e2b22
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
22 deletions
+23
-22
app/views/admin/users/_access_levels.html.haml
app/views/admin/users/_access_levels.html.haml
+22
-0
app/views/admin/users/_form.html.haml
app/views/admin/users/_form.html.haml
+1
-22
No files found.
app/views/admin/users/_access_levels.html.haml
0 → 100644
View file @
54ff60f7
%fieldset
%legend
Access
.form-group
=
f
.
label
:projects_limit
,
class:
'control-label'
.col-sm-10
=
f
.
number_field
:projects_limit
,
min:
0
,
class:
'form-control'
.form-group
=
f
.
label
:can_create_group
,
class:
'control-label'
.col-sm-10
=
f
.
check_box
:can_create_group
.form-group
=
f
.
label
:admin
,
class:
'control-label'
-
if
current_user
==
@user
.col-sm-10
=
f
.
check_box
:admin
,
disabled:
true
.col-sm-10
You cannot remove your own admin rights.
-
else
.col-sm-10
=
f
.
check_box
:admin
.form-group
=
f
.
label
:external
,
class:
'control-label'
.col-sm-10
=
f
.
check_box
:external
.col-sm-10
External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects or groups.
app/views/admin/users/_form.html.haml
View file @
54ff60f7
...
@@ -40,28 +40,7 @@
...
@@ -40,28 +40,7 @@
=
f
.
label
:password_confirmation
,
class:
'control-label'
=
f
.
label
:password_confirmation
,
class:
'control-label'
.col-sm-10
=
f
.
password_field
:password_confirmation
,
disabled:
f
.
object
.
force_random_password
,
class:
'form-control'
.col-sm-10
=
f
.
password_field
:password_confirmation
,
disabled:
f
.
object
.
force_random_password
,
class:
'form-control'
%fieldset
=
render
partial:
'access_levels'
,
locals:
{
f:
f
}
%legend
Access
.form-group
=
f
.
label
:projects_limit
,
class:
'control-label'
.col-sm-10
=
f
.
number_field
:projects_limit
,
min:
0
,
class:
'form-control'
.form-group
=
f
.
label
:can_create_group
,
class:
'control-label'
.col-sm-10
=
f
.
check_box
:can_create_group
.form-group
=
f
.
label
:admin
,
class:
'control-label'
-
if
current_user
==
@user
.col-sm-10
=
f
.
check_box
:admin
,
disabled:
true
.col-sm-10
You cannot remove your own admin rights.
-
else
.col-sm-10
=
f
.
check_box
:admin
.form-group
=
f
.
label
:external
,
class:
'control-label'
.col-sm-10
=
f
.
check_box
:external
.col-sm-10
External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects or groups.
%fieldset
%fieldset
%legend
Profile
%legend
Profile
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment