BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
2abbb098
Commit
2abbb098
authored
Sep 07, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed group members from the list for now
parent
d8fee09e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
25 deletions
+0
-25
project_members_controller.rb
app/controllers/projects/project_members_controller.rb
+0
-25
No files found.
app/controllers/projects/project_members_controller.rb
View file @
2abbb098
...
...
@@ -10,33 +10,8 @@ class Projects::ProjectMembersController < Projects::ApplicationController
project_members
=
@project
.
project_members
project_members
=
project_members
.
non_invite
unless
can?
(
current_user
,
:admin_project
,
@project
)
group
=
@project
.
group
if
group
group_members
=
group
.
group_members
group_members
=
group_members
.
non_invite
unless
can?
(
current_user
,
:admin_project
,
@project
)
end
if
params
[
:search
].
present?
groups_id
=
@groups
.
pluck
(
:group_id
)
groups
=
Group
.
where
(
id:
groups_id
).
search
(
params
[
:search
]).
to_a
@groups
=
@project
.
project_group_links
.
where
(
group_id:
groups
)
users
=
@project
.
users
.
search
(
params
[
:search
]).
to_a
project_members
=
project_members
.
where
(
user_id:
users
)
if
group_members
users
=
group
.
users
.
search
(
params
[
:search
]).
to_a
group_members
=
group_members
.
where
(
user_id:
users
)
end
end
members_ids
=
project_members
.
pluck
(
:id
)
if
group_members
members_ids
<<
group_members
.
pluck
(
:id
)
end
@members
=
Member
.
where
(
id:
members_ids
.
flatten
)
@members_size
=
@members
.
size
...
...
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