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
dea29dec
Commit
dea29dec
authored
Dec 30, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable LDAP permission override in project members edit list
Closes #1475
parent
e07bca53
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
app/views/shared/members/ee/_override_member_buttons.html.haml
...iews/shared/members/ee/_override_member_buttons.html.haml
+1
-1
changelogs/unreleased-ee/1475-disable-project-members-ldap-override.yml
...eleased-ee/1475-disable-project-members-ldap-override.yml
+4
-0
spec/features/groups/members/override_ldap_memberships_spec.rb
...features/groups/members/override_ldap_memberships_spec.rb
+7
-0
No files found.
app/views/shared/members/ee/_override_member_buttons.html.haml
View file @
dea29dec
...
...
@@ -4,7 +4,7 @@
-
action
=
local_assigns
.
fetch
(
:action
,
:edit
).
to_s
.
inquiry
-
can_override
=
local_assigns
.
fetch
(
:can_override
,
false
)
-
if
can_override
-
if
group
&&
can_override
-
if
action
.
edit?
%button
.btn.btn-default.btn-ldap-override.js-ldap-permissions
{
type:
'button'
,
'aria-label'
=>
'Edit permissions'
,
...
...
changelogs/unreleased-ee/1475-disable-project-members-ldap-override.yml
0 → 100644
View file @
dea29dec
---
title
:
Disable LDAP permission override in project members edit list
merge_request
:
author
:
spec/features/groups/members/override_ldap_memberships_spec.rb
View file @
dea29dec
...
...
@@ -7,6 +7,7 @@ feature 'Groups > Members > Master/Owner can override LDAP access levels', featu
let
(
:maryjane
)
{
create
(
:user
,
name:
'Mary Jane'
)
}
let
(
:owner
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group_with_ldap_group_link
,
:public
)
}
let
(
:project
)
{
create
(
:empty_project
,
namespace:
group
)
}
let!
(
:owner_member
)
{
create
(
:group_member
,
:owner
,
group:
group
,
user:
owner
)
}
let!
(
:ldap_member
)
{
create
(
:group_member
,
:guest
,
group:
group
,
user:
johndoe
,
ldap:
true
)
}
...
...
@@ -19,6 +20,12 @@ feature 'Groups > Members > Master/Owner can override LDAP access levels', featu
login_as
(
owner
)
end
scenario
'override not available on project members page'
,
js:
true
do
visit
namespace_project_project_members_path
(
group
,
project
)
expect
(
page
).
not_to
have_button
'Edit permissions'
end
scenario
'owner can override LDAP access level'
,
js:
true
do
ldap_override_message
=
'John Doe is currently an LDAP user. Editing their permissions will override the settings from the LDAP group sync.'
...
...
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