summaryrefslogtreecommitdiff
path: root/app/finders
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2016-12-26 10:12:24 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2017-01-03 10:52:14 -0600
commit57b5612aaa6fd243f18587acbf0a8ebbb37551f2 (patch)
treee3353bacabf62f5b086d22e5319cdc15d957fd51 /app/finders
parentad58dec2e1564e9c2d23dd32e5da8b12eeba965d (diff)
downloadgitlab-ce-57b5612aaa6fd243f18587acbf0a8ebbb37551f2.tar.gz
Removed the "Groups" option from the settings gear
Fixed more tests
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/members_finder.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/finders/members_finder.rb b/app/finders/members_finder.rb
index b476b0bc184..702944404f5 100644
--- a/app/finders/members_finder.rb
+++ b/app/finders/members_finder.rb
@@ -1,13 +1,13 @@
class MembersFinder < Projects::ApplicationController
- def initialize(project_members, group)
+ def initialize(project_members, project_group)
@project_members = project_members
- @group = group
+ @project_group = project_group
end
- def execute
+ def execute(current_user)
non_null_user_ids = @project_members.where.not(user_id: nil).select(:user_id)
- group_members = @group.group_members.where.not(user_id: non_null_user_ids)
- group_members = group_members.non_invite unless can?(current_user, :admin_group, @group)
+ group_members = @project_group.group_members.where.not(user_id: non_null_user_ids)
+ group_members = group_members.non_invite unless can?(current_user, :admin_group, @project_group)
group_members
end
end