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
iv
gitlab-ce
Commits
90dafe31
Commit
90dafe31
authored
9 years ago
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only show invited users to people who can admin group.
parent
2a1d4255
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
app/controllers/groups/group_members_controller.rb
app/controllers/groups/group_members_controller.rb
+1
-0
app/controllers/projects/project_members_controller.rb
app/controllers/projects/project_members_controller.rb
+2
-0
No files found.
app/controllers/groups/group_members_controller.rb
View file @
90dafe31
...
...
@@ -11,6 +11,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
def
index
@project
=
@group
.
projects
.
find
(
params
[
:project_id
])
if
params
[
:project_id
]
@members
=
@group
.
group_members
@members
=
@members
.
non_invite
unless
can?
(
current_user
,
:admin_group
,
@group
)
if
params
[
:search
].
present?
users
=
@group
.
users
.
search
(
params
[
:search
]).
to_a
...
...
This diff is collapsed.
Click to expand it.
app/controllers/projects/project_members_controller.rb
View file @
90dafe31
...
...
@@ -6,6 +6,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
def
index
@project_members
=
@project
.
project_members
@project_members
=
@project_members
.
non_invite
unless
can?
(
current_user
,
:admin_project
,
@project
)
if
params
[
:search
].
present?
users
=
@project
.
users
.
search
(
params
[
:search
]).
to_a
...
...
@@ -17,6 +18,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@group
=
@project
.
group
if
@group
@group_members
=
@group
.
group_members
@group_members
=
@group_members
.
non_invite
unless
can?
(
current_user
,
:admin_group
,
@group
)
if
params
[
:search
].
present?
users
=
@group
.
users
.
search
(
params
[
:search
]).
to_a
...
...
This diff is collapsed.
Click to expand it.
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