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
52df0b39
Commit
52df0b39
authored
Apr 03, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the LDAP-synced group member permissions override feature
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
c2eff648
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/views/shared/members/_member.html.haml
app/views/shared/members/_member.html.haml
+1
-1
No files found.
app/views/shared/members/_member.html.haml
View file @
52df0b39
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
.controls.member-controls
.controls.member-controls
=
render
'shared/members/ee/ldap_tag'
,
can_override:
can_override_member
,
visible:
false
=
render
'shared/members/ee/ldap_tag'
,
can_override:
can_override_member
,
visible:
false
-
if
show_controls
&&
member
.
source
==
current_resource
-
if
show_controls
&&
member
.
source
==
current_resource
-
if
user
!=
current_user
&&
can_admin_member
-
if
user
!=
current_user
&&
(
can_admin_member
||
can_override_member
)
=
form_for
member
,
remote:
true
,
html:
{
class:
'form-horizontal js-edit-member-form'
}
do
|
f
|
=
form_for
member
,
remote:
true
,
html:
{
class:
'form-horizontal js-edit-member-form'
}
do
|
f
|
=
f
.
hidden_field
:access_level
=
f
.
hidden_field
:access_level
.member-form-control.dropdown.append-right-5
.member-form-control.dropdown.append-right-5
...
...
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