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
90dafe31
Commit
90dafe31
authored
Apr 10, 2015
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
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
group_members_controller.rb
app/controllers/groups/group_members_controller.rb
+1
-0
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
...
@@ -11,6 +11,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
def
index
def
index
@project
=
@group
.
projects
.
find
(
params
[
:project_id
])
if
params
[
:project_id
]
@project
=
@group
.
projects
.
find
(
params
[
:project_id
])
if
params
[
:project_id
]
@members
=
@group
.
group_members
@members
=
@group
.
group_members
@members
=
@members
.
non_invite
unless
can?
(
current_user
,
:admin_group
,
@group
)
if
params
[
:search
].
present?
if
params
[
:search
].
present?
users
=
@group
.
users
.
search
(
params
[
:search
]).
to_a
users
=
@group
.
users
.
search
(
params
[
:search
]).
to_a
...
...
app/controllers/projects/project_members_controller.rb
View file @
90dafe31
...
@@ -6,6 +6,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
...
@@ -6,6 +6,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
def
index
def
index
@project_members
=
@project
.
project_members
@project_members
=
@project
.
project_members
@project_members
=
@project_members
.
non_invite
unless
can?
(
current_user
,
:admin_project
,
@project
)
if
params
[
:search
].
present?
if
params
[
:search
].
present?
users
=
@project
.
users
.
search
(
params
[
:search
]).
to_a
users
=
@project
.
users
.
search
(
params
[
:search
]).
to_a
...
@@ -17,6 +18,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
...
@@ -17,6 +18,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@group
=
@project
.
group
@group
=
@project
.
group
if
@group
if
@group
@group_members
=
@group
.
group_members
@group_members
=
@group
.
group_members
@group_members
=
@group_members
.
non_invite
unless
can?
(
current_user
,
:admin_group
,
@group
)
if
params
[
:search
].
present?
if
params
[
:search
].
present?
users
=
@group
.
users
.
search
(
params
[
:search
]).
to_a
users
=
@group
.
users
.
search
(
params
[
:search
]).
to_a
...
...
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