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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
38d81a60
Commit
38d81a60
authored
May 16, 2019
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve CE/EE diffs in admin user access levels
Part of single codebase changes.
parent
2cdb7824
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
app/views/admin/users/_access_levels.html.haml
app/views/admin/users/_access_levels.html.haml
+1
-6
ee/app/views/admin/users/_auditor_access_level_radio.html.haml
...p/views/admin/users/_auditor_access_level_radio.html.haml
+8
-0
No files found.
app/views/admin/users/_access_levels.html.haml
View file @
38d81a60
...
@@ -22,12 +22,7 @@
...
@@ -22,12 +22,7 @@
%p
.light
%p
.light
Regular users have access to their groups and projects
Regular users have access to their groups and projects
-
if
license_allows_auditor_user?
=
render_if_exists
'admin/users/auditor_access_level_radio'
,
f:
f
,
disabled:
editing_current_user
=
f
.
radio_button
:access_level
,
:auditor
,
disabled:
editing_current_user
=
label_tag
:auditor
,
class:
'font-weight-bold'
do
Auditor
%p
.light
Auditors have read-only access to all groups, projects and users
=
f
.
radio_button
:access_level
,
:admin
,
disabled:
editing_current_user
=
f
.
radio_button
:access_level
,
:admin
,
disabled:
editing_current_user
=
label_tag
:admin
,
class:
'font-weight-bold'
do
=
label_tag
:admin
,
class:
'font-weight-bold'
do
...
...
ee/app/views/admin/users/_auditor_access_level_radio.html.haml
0 → 100644
View file @
38d81a60
-
disabled
=
params
.
fetch
(
:disabled
,
false
)
-
if
license_allows_auditor_user?
=
f
.
radio_button
:access_level
,
:auditor
,
disabled:
disabled
=
label_tag
:auditor
,
class:
'font-weight-bold'
do
Auditor
%p
.light
Auditors have read-only access to all groups, projects and users
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